Erik Johnston 10294b6082 Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor ... Conflicts: synapse/storage/_base.py		2014-08-14 10:01:04 +01:00
..
schema	Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor	2014-08-14 10:01:04 +01:00
__init__.py	Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor	2014-08-14 10:01:04 +01:00
_base.py	Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor	2014-08-14 10:01:04 +01:00
directory.py	…
feedback.py	…
pdu.py	…
presence.py	…
profile.py	…
registration.py	…
room.py	…
roommember.py	…
stream.py	…
transactions.py	…