matrix-org

You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Mark Haines 4b63b06cad Merge branch 'develop' into storage_transactions ... Conflicts: synapse/api/auth.py synapse/handlers/room.py synapse/storage/__init__.py		10 years ago
..
__init__.py	…
_base.py	…
directory.py	…
events.py	…
federation.py	…
login.py	…
presence.py	…
profile.py	…
register.py	…
room.py	Merge branch 'develop' into storage_transactions	10 years ago