appelemac f3ee5042b7 Merge remote-tracking branch 'refs/remotes/Kwoth/master' into patch-4 ... # Conflicts: # NadekoBot/NadekoBot.cs # NadekoBot/NadekoBot.csproj		2016-05-02 14:23:17 +02:00
..
DataModels	Added toggle-able deletion of greet/bye messages	2016-05-02 01:31:35 +02:00
JSONModels	Update config.json	2016-04-27 15:12:38 +02:00