Merge branch 'master' of https://github.com/steveperry-53/steveperry-53.github.io

Conflicts: README.md _config.yml
2016-10-15 13:31:14 -07:00
parent 93d5887c4b 5d60ea4488
commit 81cb7792c1
206 changed files with 2991 additions and 2599 deletions
@@ -18,7 +18,7 @@ defaults:
    values:
      version: "v1.3"
      githubbranch: "master"
-      docsbranch: "release-1.3"
+      docsbranch: "master"
  -
    scope:
      path: "docs"