Erik Johnston 81391fa162 Merge branch 'develop' of github.com:matrix-org/synapse into erikj/media_storage_refactor		2018-01-12 11:28:49 +00:00
..
client	Add /room/{id}/event/{id} to synapse	2018-01-09 14:39:12 +00:00
key	replace 'except:' with 'except Exception:'	2017-10-23 15:52:32 +01:00
media	Remove unnecessary condition	2018-01-12 11:28:32 +00:00
__init__.py	Add local group server support	2017-07-17 12:03:49 +01:00