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

Merge branch 'master' into quizmaster-fr
---

72cd0863402908a3106575e2de53b315f2e44225
diff --cc _testing/config.yml
index f6501ac,3b477f6..94c99a4
--- a/_testing/config.yml
+++ b/_testing/config.yml
@@@ -53,8 -53,7 +53,6 @@@ whitelist
    - oidenty
    - 'on'
    - osd
-   - quizmaster
-   - quiz
 -  - quizmaster-fr
    - stocks
    - tvmusor
    - wordcompletition