Mark Haines f8b865264a Merge branch 'develop' into key_distribution ... Conflicts: synapse/crypto/keyring.py		2015-04-27 18:29:32 +01:00
..
client
key	Copyright notice	2015-04-24 10:36:51 +01:00
media	Implement locks using create_observer for fetching media and server keys	2015-04-27 14:20:26 +01:00
__init__.py