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 984e207b59 Merge branch develop into server2server_signing ... Conflicts: synapse/app/homeserver.py		10 years ago
..
__init__.py	fix the copyright holder from matrix.org to OpenMarket Ltd, as matrix.org hasn't been incorporated in time for launch.	10 years ago
homeserver.py	Merge branch develop into server2server_signing	10 years ago