synapse-product/synapse/federation
Erik Johnston bb4a20174c Merge branch 'develop' of github.com:matrix-org/synapse into federation_authorization
Conflicts:
	synapse/federation/transport.py
	synapse/handlers/message.py
2014-10-27 10:20:44 +00:00
..
__init__.py Verify signatures for server2server requests 2014-10-13 14:37:46 +01:00
pdu_codec.py SPEC-7: Rename 'ts' to 'origin_server_ts' 2014-10-17 17:12:25 +01:00
persistence.py SPEC-7: Rename 'ts' to 'origin_server_ts' 2014-10-17 17:12:25 +01:00
replication.py Merge branch 'develop' of github.com:matrix-org/synapse into federation_authorization 2014-10-27 10:20:44 +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 keep 'origin_server_ts' as 'ts' in the database to avoid needlessly updating schema 2014-10-17 17:31:48 +01:00