Merge branch 'master' into sort-flags

2016-10-22 10:22:16 -07:00
parent c516bce8f1 3f4989051e
commit 64fcd51526
1 changed files with 3 additions and 0 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,6 +12,7 @@ go:
 - 1.4.2
 - 1.5.x
 - 1.6.x
+- 1.7.x
 - master

 matrix:
@@ -20,6 +21,8 @@ matrix:
  include:
  - go: 1.6.x
    os: osx
+  - go: 1.7.x
+    os: osx

 before_script:
 - go get github.com/urfave/gfmrun/... || true