Merge branch 'fkndean-1.0' into 1.0

Merged fkndean1.0 - wikia and minecraftquery
This commit is contained in:
Kwoth
2016-11-09 16:58:04 +01:00
4 changed files with 442 additions and 4 deletions

2
.gitignore vendored
View File

@ -2,7 +2,7 @@
src/NadekoBot/credentials.json
src/NadekoBot/data/NadekoBot.db
src/NadekoBot/musicdata
src/NadekoBot/data/musicdata
# Created by https://www.gitignore.io/api/visualstudio,visualstudiocode,windows,linux,macos