Merge remote-tracking branch 'origin/master' into v2

This commit is contained in:
Dan Buch 2016-05-25 09:18:48 -04:00
commit 8c89b2c442
No known key found for this signature in database
GPG Key ID: FAEF12936DD3E3EC

View File

@ -24,7 +24,7 @@ matrix:
- ./runtests test - ./runtests test
before_script: before_script:
- go get github.com/meatballhat/gfmxr/... - go get github.com/urfave/gfmxr/...
script: script:
- ./runtests vet - ./runtests vet