From: ailin-nemui <redacted>
Date: Mon, 3 Apr 2017 19:11:21 +0000 (+0200)
Subject: Merge branch 'master' into quizmaster
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=1af8c32cfff01505ee8ff976b9f034b6dc939694;p=irssi-scripts.irssi.org.git

Merge branch 'master' into quizmaster
---

1af8c32cfff01505ee8ff976b9f034b6dc939694
diff --cc _testing/config.yml
index 8801930,0b0fea4..3b477f6
--- a/_testing/config.yml
+++ b/_testing/config.yml
@@@ -54,7 -54,7 +54,6 @@@ whitelist
    - 'on'
    - osd
    - quizmaster-fr
-   - quiz
 -  - quizmaster
    - stocks
    - tvmusor
    - wordcompletition