Merge branch 'master' into quizmaster

author ailin-nemui <redacted>

Mon, 3 Apr 2017 19:11:21 +0000 (21:11 +0200)

committer GitHub <redacted>

Mon, 3 Apr 2017 19:11:21 +0000 (21:11 +0200)
author ailin-nemui <redacted>
Mon, 3 Apr 2017 19:11:21 +0000 (21:11 +0200)
committer GitHub <redacted>
Mon, 3 Apr 2017 19:11:21 +0000 (21:11 +0200)
diff --cc _testing/config.yml

index 880193060e471c021bff1f0510dca60d06bea5ea,0b0fea417e2a9c156ef4e3e8a7eb05d4f2eebfe8..3b477f60b605cc1a935cd7d3968aa846e2e9cdfc
--- 1/_testing/config.yml
--- 2/_testing/config.yml
+++ b/_testing/config.yml
@@@ -54,7 -54,7 +54,6 @@@ whitelist
     - 'on'
     - osd
     - quizmaster-fr
-   - quiz
- -  - quizmaster
     - stocks
     - tvmusor
     - wordcompletition
author	ailin-nemui <redacted>
	Mon, 3 Apr 2017 19:11:21 +0000 (21:11 +0200)
committer	GitHub <redacted>
	Mon, 3 Apr 2017 19:11:21 +0000 (21:11 +0200)