Mark Haines 4ad8b45155 Merge branch 'develop' into key_distribution ... Conflicts: synapse/config/homeserver.py		2015-04-29 13:15:14 +01:00
..
client	pep8	2015-04-27 12:36:59 +01:00
key	Implement minimum_valid_until_ts in the remote key resource	2015-04-29 11:57:26 +01:00
media	Implement locks using create_observer for fetching media and server keys	2015-04-27 14:20:26 +01:00
__init__.py	…