Erik Johnston 1bd540ef79 Merge branch 'develop' of github.com:matrix-org/synapse into rejections ... Conflicts: synapse/storage/schema/im.sql		2015-01-30 15:16:38 +00:00
..
__init__.py	…
auth.py	…
constants.py	…
errors.py	…
filtering.py	…
ratelimiting.py	…
urls.py	…