Erik Johnston 2ebf795c0a Merge branch 'develop' of github.com:matrix-org/synapse into rejections ... Conflicts: synapse/storage/__init__.py synapse/storage/schema/delta/v12.sql		2015-01-30 11:10:37 +00:00
..
api	…
federation	…
handlers	Initial implementation of auth conflict resolution	2015-01-29 16:52:33 +00:00
rest	…
storage	…
util	…
__init__.py	fix the copyright holder from matrix.org to OpenMarket Ltd, as matrix.org hasn't been incorporated in time for launch.	2014-09-03 17:31:57 +01:00
test_distributor.py	…
test_state.py	…
test_test_utils.py	…
test_types.py	Replace hs.parse_roomalias with RoomAlias.from_string	2015-01-23 13:21:58 +00:00
unittest.py	…
utils.py	…