Erik Johnston ad9226eeec Merge branch 'event_signing' of github.com:matrix-org/synapse into federation_authorization ...

Conflicts:
	synapse/storage/__init__.py

2014-10-27 11:58:32 +00:00

..

__init__.py

Verify signatures for server2server requests

2014-10-13 14:37:46 +01:00

pdu_codec.py

Merge branch 'develop' into event_signing

2014-10-17 17:33:58 +01:00

persistence.py

SPEC-7: Rename 'ts' to 'origin_server_ts'

2014-10-17 17:12:25 +01:00

replication.py

Merge branch 'event_signing' of github.com:matrix-org/synapse into federation_authorization

2014-10-27 11:58:32 +00:00

transport.py

Merge branch 'develop' of github.com:matrix-org/synapse into federation_authorization

2014-10-27 10:20:44 +00:00

units.py

fix pyflakes warnings

2014-10-27 11:19:15 +00:00