diff options
author | Kegan Dougal <kegan@matrix.org> | 2015-04-01 10:19:17 +0100 |
---|---|---|
committer | Kegan Dougal <kegan@matrix.org> | 2015-04-01 10:19:17 +0100 |
commit | 9fa8bda09915b83aab1b5de1760dceafe1d87e07 (patch) | |
tree | 3c8d7e4bc69871ac1316a5763d885e5f7a9ba7d7 /synapse | |
parent | Add same user_id char checks as registration. (diff) | |
parent | Fix thinko whereby events *for the AS specifically* were not passed on. (diff) | |
download | synapse-9fa8bda09915b83aab1b5de1760dceafe1d87e07.tar.xz |
Merge branch 'develop' into application-services-registration-script
Diffstat (limited to 'synapse')
-rw-r--r-- | synapse/appservice/__init__.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/synapse/appservice/__init__.py b/synapse/appservice/__init__.py |