Mark Haines f8b865264a Merge branch 'develop' into key_distribution ...

Conflicts:
	synapse/crypto/keyring.py

2015-04-27 18:29:32 +01:00

..

__init__.py

Update copyright notices

2015-01-06 13:21:39 +00:00

context_factory.py

Don't look for an TLS private key if we have set --no-tls

2015-03-06 11:34:06 +00:00

event_signing.py

Update copyright notices

2015-01-06 13:21:39 +00:00

keyclient.py

Implement remote key lookup api

2015-04-22 14:21:08 +01:00

keyring.py

Merge branch 'develop' into key_distribution

2015-04-27 18:29:32 +01:00