summary refs log tree commit diff
path: root/synapse/appservice
diff options
context:
space:
mode:
authorKegsay <kegsay@gmail.com>2015-04-01 13:51:15 +0100
committerKegsay <kegsay@gmail.com>2015-04-01 13:51:15 +0100
commit80a620a83a2282d8c740d20a8ca9147071287f2f (patch)
tree3c8d7e4bc69871ac1316a5763d885e5f7a9ba7d7 /synapse/appservice
parentFix thinko whereby events *for the AS specifically* were not passed on. (diff)
parentMerge branch 'develop' into application-services-registration-script (diff)
downloadsynapse-80a620a83a2282d8c740d20a8ca9147071287f2f.tar.xz
Merge pull request #116 from matrix-org/application-services-registration-script
Application services registration changes (PR #116)
Diffstat (limited to 'synapse/appservice')
-rw-r--r--synapse/appservice/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/appservice/__init__.py b/synapse/appservice/__init__.py
index 4a6cdbc2be..ab0a6955f0 100644
--- a/synapse/appservice/__init__.py
+++ b/synapse/appservice/__init__.py
@@ -95,7 +95,7 @@ class ApplicationService(object):
         #   rooms: [ {regex: "[A-z]+.*", exclusive: true}, ...],
         # }
         if not namespaces:
-            return None
+            namespaces = {}
 
         for ns in ApplicationService.NS_LIST:
             if ns not in namespaces: