Mark Haines e903c941cb Merge branch 'develop' into request_logging ... Conflicts: setup.py synapse/storage/_base.py synapse/util/async.py		2014-11-14 11:16:50 +00:00
..
api	…
events	Fix validation tests	2014-11-11 10:31:59 +00:00
federation	SYN-103: Remove "origin" and "destination" keys from edus	2014-11-13 15:49:03 +00:00
handlers	SYN-103: Remove "origin" and "destination" keys from edus	2014-11-13 15:49:03 +00:00
rest	Only allow people in a room to look up room state.	2014-11-11 17:55:32 +00:00
storage	Fix SQLBaseStoreTestCase	2014-11-10 15:32:35 +00:00
util	…
__init__.py	…
test_distributor.py	…
test_state.py	Rename annotate_state_groups to annotate_event_with_state	2014-11-11 16:58:53 +00:00
test_types.py	…
unittest.py	…
utils.py	…