Erik Johnston 347242a5c4 Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor ...

Conflicts:
	tests/rest/test_presence.py
	tests/rest/test_rooms.py
	tests/utils.py

2014-08-19 14:48:19 +01:00

..

__init__.py

Make federation use resource_for_federation as well.

2014-08-14 10:05:06 +01:00

handler.py

Add a 'backfill room' button

2014-08-19 14:20:03 +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

Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor

2014-08-19 14:48:19 +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