mirror of
https://git.anonymousland.org/anonymousland/synapse.git
synced 2025-12-09 23:47:42 -05:00
Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor
Conflicts: tests/rest/test_presence.py tests/rest/test_rooms.py tests/utils.py
This commit is contained in:
commit
347242a5c4
29 changed files with 1258 additions and 393 deletions
|
|
@ -17,4 +17,5 @@
|
|||
|
||||
CLIENT_PREFIX = "/matrix/client/api/v1"
|
||||
FEDERATION_PREFIX = "/matrix/federation/v1"
|
||||
WEB_CLIENT_PREFIX = "/matrix/client"
|
||||
WEB_CLIENT_PREFIX = "/matrix/client"
|
||||
CONTENT_REPO_PREFIX = "/matrix/content"
|
||||
Loading…
Add table
Add a link
Reference in a new issue