Merge branch 'master' into dev

This commit is contained in:
Claude 2016-09-03 11:41:56 +02:00
commit 5193180c9d

View File

@ -185,7 +185,7 @@ $config['apikey'] = '';
* without apikey: badword-check applies
* with apikey: badwords are ignored
*
* this is useful to maintain a restrictive blocklist
* This is useful to maintain a restrictive blocklist
* for spammers and bypass it using the apikey.
*
**/