Merge branch 'master' into sort-flags

This commit is contained in:
Jesse Szwedko
2016-10-22 10:22:16 -07:00
committed by GitHub

View File

@@ -12,6 +12,7 @@ go:
- 1.4.2 - 1.4.2
- 1.5.x - 1.5.x
- 1.6.x - 1.6.x
- 1.7.x
- master - master
matrix: matrix:
@@ -20,6 +21,8 @@ matrix:
include: include:
- go: 1.6.x - go: 1.6.x
os: osx os: osx
- go: 1.7.x
os: osx
before_script: before_script:
- go get github.com/urfave/gfmrun/... || true - go get github.com/urfave/gfmrun/... || true