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	…
handler.py	Add a 'backfill room' button	2014-08-19 14:20:03 +01:00
pdu_codec.py	…
persistence.py	…
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	…