Shikhir Arora 26e769c6dd Merge remote-tracking branch 'Kwoth/dev' into dev ... # Conflicts: # src/NadekoBot/Resources/CommandStrings.resx		2017-02-15 07:10:31 -05:00
..
NadekoBot	Merge remote-tracking branch 'Kwoth/dev' into dev	2017-02-15 07:10:31 -05:00