Mark Haines 29b25d59c6 Merge branch 'develop' into markjh/verify ...

Conflicts:
	synapse/crypto/keyring.py

2016-07-27 15:11:02 +01:00

..

__init__.py

copyrights

2016-01-07 04:26:29 +00:00

context_factory.py

Uncommit accidentally commited edit to cipher list

2016-05-10 18:44:32 +02:00

event_signing.py

copyrights

2016-01-07 04:26:29 +00:00

keyclient.py

Make key client send a Host header

2016-03-11 10:29:05 +00:00

keyring.py

Merge branch 'develop' into markjh/verify

2016-07-27 15:11:02 +01:00