David Baker 6532b6e607 Merge branch 'develop' into csauth ... Conflicts: synapse/http/server.py		2015-04-24 09:37:54 +01:00
..
api
appservice
federation
handlers	Remove users from the remote_offline_serials list (and clean up empty elements) when they go online again	2015-04-23 19:01:37 +01:00
metrics
rest	Merge branch 'develop' into csauth	2015-04-17 13:51:10 +01:00
storage	Merge branch 'develop' into csauth	2015-04-17 13:51:10 +01:00
util
__init__.py
test_distributor.py
test_state.py
test_test_utils.py
test_types.py
unittest.py
utils.py