Merge branch 'dev', remove debug statements, modify for no Flow

* Merge changes on dev branch * Remove debug statements from matchbot.py * Add hack to account for Flow not being enabled
fhocutt · Apr 30, 2015 · 00bd93f · 00bd93f
2 parents de274c4 + 6e7b976
commit 00bd93f
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/config.json.sample b/config.json.sample
@@ -14,14 +14,16 @@
             "Category:Co-op/Requests/Communication",
             "Category:Co-op/Requests/Writing",
             "Category:Co-op/Requests/Other",
-            "Category:Co-op/Requests/Technical editing"
+            "Category:Co-op/Requests/Technical editing",
+            "Category:Co-op/Requests/Images and media"
         ],
         "mentorcategories": [
             "Category:Co-op mentors with best practice skills",
             "Category:Co-op mentors with communication skills",
             "Category:Co-op mentors with writing skills",
             "Category:Co-op mentors with general editing skills",
-            "Category:Co-op mentors with technical editing skills"
+            "Category:Co-op mentors with technical editing skills",
+            "Category:Co-op mentors with multimedia skills"
         ]
     },
     "dbinfo": {