Merge branch 'master' into develop

Conflicts:
	README.md
	discord.go
This commit is contained in:
Bruce 2017-05-15 14:59:20 +00:00
commit 2feb43f068
2 changed files with 2 additions and 2 deletions

View file

@ -10,5 +10,5 @@ install:
script: script:
- diff <(gofmt -d .) <(echo -n) - diff <(gofmt -d .) <(echo -n)
- go vet -x ./... - go vet -x ./...
- golint -set_exit_status ./... - golint ./...
- go test -v -race ./... - go test -v -race ./...

View file

@ -20,7 +20,7 @@ import (
"time" "time"
) )
// VERSION of Discordgo, follows Symantic Versioning. (http://semver.org/) // VERSION of DiscordGo, follows Semantic Versioning. (http://semver.org/)
const VERSION = "0.16.0-dev" const VERSION = "0.16.0-dev"
// ErrMFA will be risen by New when the user has 2FA. // ErrMFA will be risen by New when the user has 2FA.