Erik Johnston 1bd540ef79 Merge branch 'develop' of github.com:matrix-org/synapse into rejections ... Conflicts: synapse/storage/schema/im.sql		2015-01-30 15:16:38 +00:00
..
api	Create a separate filter object to do the actual filtering, so that we can	2015-01-29 17:45:07 +00:00
federation	…
handlers	Initial implementation of auth conflict resolution	2015-01-29 16:52:33 +00:00
rest	Merge in auth changes from develop	2015-01-29 15:54:54 +00:00
storage	Extract the id token of the token when authing users, include the token and device_id in the internal meta data for the event along with the transaction id when sending events	2015-01-28 16:58:23 +00:00
util	…
__init__.py	…
test_distributor.py	…
test_state.py	…
test_test_utils.py	…
test_types.py	…
unittest.py	…
utils.py	…