Erik Johnston b94a43d5b5 Merge branch 'develop' of github.com:matrix-org/synapse into erikj/alias_disallow_list		2018-10-25 15:25:31 +01:00
..
__init__.py
test_generate.py	Fix a number of flake8 errors	2018-10-24 10:39:03 +01:00
test_load.py
test_room_directory.py	Use allow/deny	2018-10-25 15:25:21 +01:00