Mark Haines d547afeae0 Merge remote-tracking branch 'origin/master' into develop		2015-12-07 13:13:43 +00:00
..
api	…
appservice	…
crypto	…
events	…
federation	Update tests	2015-11-17 18:38:48 +00:00
handlers	rename the method in the tests as well	2015-12-01 16:06:17 +00:00
metrics	…
rest	…
storage	Fix mock import in tests.	2015-12-06 20:50:11 +00:00
util	…
__init__.py	…
test_distributor.py	…
test_state.py	…
test_test_utils.py	…
test_types.py	…
unittest.py	…
utils.py	Host /unstable and /r0 versions of r0 APIs	2015-12-01 17:34:32 +00:00