Erik Johnston 47519cd8c2 Merge branch 'develop' of github.com:matrix-org/synapse into stream_refactor ... Conflicts: synapse/handlers/events.py synapse/rest/events.py synapse/rest/room.py		2014-08-27 14:13:06 +01:00
..
schema	…
__init__.py	…
_base.py	…
directory.py	…
feedback.py	…
pdu.py	…
presence.py	…
profile.py	…
registration.py	…
room.py	…
roommember.py	…
stream.py	…
transactions.py	…