Merge branch 'master' into master

This commit is contained in:
Jesse Szwedko 2017-04-24 14:13:35 -07:00 committed by GitHub
commit d3793766a3

View File

@ -7,12 +7,9 @@ cache:
- node_modules - node_modules
go: go:
- 1.2.x
- 1.3.x
- 1.4.2
- 1.5.x
- 1.6.x - 1.6.x
- 1.7.x - 1.7.x
- 1.8.x
- master - master
matrix: matrix:
@ -23,10 +20,12 @@ matrix:
os: osx os: osx
- go: 1.7.x - go: 1.7.x
os: osx os: osx
- go: 1.8.x
os: osx
before_script: before_script:
- go get github.com/urfave/gfmrun/... || true - go get github.com/urfave/gfmrun/... || true
- go get golang.org/x/tools/... || true - go get golang.org/x/tools/cmd/goimports
- if [ ! -f node_modules/.bin/markdown-toc ] ; then - if [ ! -f node_modules/.bin/markdown-toc ] ; then
npm install markdown-toc ; npm install markdown-toc ;
fi fi