Home Explore Help
Sign In
thisnthat
/
discordgo
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge branch 'master' into develop

Conflicts:
	README.md
	discord.go
Bruce 7 years ago
parent
eed1d20f1a ccbdeb8c54
commit
2feb43f068
2 changed files with 2 additions and 2 deletions
Split View Show Diff Stats
  1. 1 1
      .travis.yml
  2. 1 1
      discord.go

+ 1 - 1
.travis.yml
View File 

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

+ 1 - 1
discord.go
View File 

@@ -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.