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.

David Baker c291a4d522 Merge branch 'develop' into pushers ... Conflicts: synapse/handlers/events.py synapse/server.py		10 years ago
..
client	Merge branch 'develop' into pushers	10 years ago
media	Move rest APIs back under the rest directory	10 years ago
__init__.py	Merge branch 'develop' into pushers	10 years ago