David Baker c291a4d522 Merge branch 'develop' into pushers ... Conflicts: synapse/handlers/events.py synapse/server.py		2015-01-28 12:51:05 +00:00
..
__init__.py	Merge branch 'develop' into pushers	2015-01-28 12:51:05 +00:00
admin.py	…
base.py	…
directory.py	…
events.py	…
initial_sync.py	…
login.py	…
presence.py	…
profile.py	…
push_rule.py	…
pusher.py	…
register.py	…
room.py	…
transactions.py	…
voip.py	…