Mark Haines 4b63b06cad Merge branch 'develop' into storage_transactions ... Conflicts: synapse/api/auth.py synapse/handlers/room.py synapse/storage/__init__.py		2014-08-26 16:07:05 +01:00
..
__init__.py	Make federation use resource_for_federation as well.	2014-08-14 10:05:06 +01:00
handler.py	Take a snapshot of the state of the room before performing updates	2014-08-22 17:00:10 +01:00
pdu_codec.py	add in whitespace after copyright statements to improve legibility	2014-08-13 03:14:34 +01:00
persistence.py	when we're talking about backfilling data in federation, call it backfilling - not pagination.	2014-08-13 18:17:09 +01:00
replication.py	Ensure that we don't have duplicate hosts in the pdu destinations list	2014-08-24 14:35:13 +01:00
transport.py	Added a urls module for keeping client and federation prefixes.	2014-08-14 11:52:56 +01:00
units.py	add in whitespace after copyright statements to improve legibility	2014-08-13 03:14:34 +01:00