Merge branch 'master' into develop

2026-04-24 03:45:38 +08:00 · 2017-08-23 12:03:32 -04:00
parent 7cab888c64 c1c18a78d3
commit 73c39b0bb4
4 changed files with 88 additions and 51 deletions
--- a/docs/aglio_templates/mixins.jade
+++ b/docs/aglio_templates/mixins.jade
@@ -8,7 +8,7 @@ mixin TryMe(action)
         div
         div
           span.method(class="badge get",style="float:left")
-             a.method(href="https://core.blockstack.org" + myUri, style="color:rgb(51, 122, 183);font-size:12pt")
+             a.method(href=myUri, style="color:rgb(51, 122, 183);font-size:12pt")
               = "Try It!"
             | &nbsp;
         p
--- a/docs/api-specs.md
+++ b/docs/api-specs.md
@@ -40,7 +40,7 @@ Ping the blockstack node to see if it's alive.
  
            {
             "status": "alive", 
-             "version": "0.14.2"
+             "version": "###version###"
            }
  + Schema