David Baker 27955056e0 Merge branch 'develop' into erikj/groups_merged		2017-10-02 16:20:41 +01:00
..
client	Merge branch 'develop' into erikj/groups_merged	2017-10-02 16:20:41 +01:00
key	Fix code for reporting old verify keys in synapse	2017-04-24 18:51:25 +01:00
media	Only log if we've removed media	2017-09-28 16:08:08 +01:00
__init__.py	Add local group server support	2017-07-17 12:03:49 +01:00