Mark Haines 9605593d11 Merge branch 'develop' into server2server_signing ... Conflicts: synapse/storage/__init__.py tests/rest/test_presence.py		2014-09-30 17:55:06 +01:00
..
__init__.py	…
test_events.py	…
test_presence.py	Merge branch 'develop' into server2server_signing	2014-09-30 17:55:06 +01:00
test_profile.py	Track the IP users connect with. Add an admin column to users table.	2014-09-26 16:36:24 +01:00
test_rooms.py	Unbreak tests after changing storage API	2014-09-29 15:35:57 +01:00
utils.py	…