Merge remote-tracking branch 'upstream/master' into dev

2016-10-04 20:16:20 +02:00
parent eba048181e 4e0d717adc
commit 34ed5a33cb
7 changed files with 117 additions and 48 deletions
--- a/config.lua.example
+++ b/config.lua.example
@@ -61,7 +61,7 @@ Sende /hilfe, um zu starten
        max_reminders_private = 50
    },

-    chatter = {
+    cleverbot = {
        cleverbot_api = 'https://brawlbot.tk/apis/chatter-bot-api/cleverbot.php?text=',
        connection = 'Ich möchte jetzt nicht reden.',
        response = 'Ich weiß nicht, wie ich darauf reagieren soll.'