Merge branch 'master' into develop

Conflicts: README.md discord.go
bwmarrin · May 15, 2017 · 2feb43f · 2feb43f
2 parents eed1d20 + ccbdeb8
commit 2feb43f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -10,5 +10,5 @@ install:
 script:
     - diff <(gofmt -d .) <(echo -n)
     - go vet -x ./...
-    - golint -set_exit_status ./...
+    - golint ./...
     - go test -v -race ./...
diff --git a/discord.go b/discord.go
@@ -20,7 +20,7 @@ import (
 	"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"
 
 // ErrMFA will be risen by New when the user has 2FA.