Mark Haines 357dd1871d Merge branch 'develop' into storage_transactions ... Conflicts: tests/handlers/test_federation.py tests/handlers/test_room.py		2014-08-27 17:28:55 +01:00
..
events	…
federation	…
handlers	Merge branch 'develop' into storage_transactions	2014-08-27 17:28:55 +01:00
rest	Merge branch 'develop' into storage_transactions	2014-08-27 16:54:12 +01:00
storage	…
util	…
__init__.py	…
test_distributor.py	…
test_state.py	Start updating state handling to use snapshots	2014-08-27 15:11:51 +01:00
test_types.py	…
utils.py	Fill out prev_events before calling persist_event	2014-08-27 14:32:19 +01:00