Mark Haines dc3c2823ac Merge branch 'develop' into event_signing ... Conflicts: synapse/federation/replication.py		2014-10-17 17:33:58 +01:00
..
api	…
events	…
federation	Merge branch 'develop' into event_signing	2014-10-17 17:33:58 +01:00
handlers	SPEC-7: Rename 'ts' to 'origin_server_ts'	2014-10-17 17:12:25 +01:00
rest	Sign outgoing PDUs.	2014-10-16 00:09:48 +01:00
storage	SYN-2: Allow server admins to delete room aliases	2014-09-30 11:31:42 +01:00
util	…
__init__.py	…
test_distributor.py	…
test_state.py	SPEC-7: Rename 'ts' to 'origin_server_ts'	2014-10-17 17:12:25 +01:00
test_types.py	…
unittest.py	…
utils.py	Sign outgoing PDUs.	2014-10-16 00:09:48 +01:00