diff options
| author | Paul "LeoNerd" Evans <paul@matrix.org> | 2014-12-11 18:34:26 +0000 |
|---|---|---|
| committer | Paul "LeoNerd" Evans <paul@matrix.org> | 2014-12-11 18:34:26 +0000 |
| commit | 57b509454527752c2c4153a43294beb65a38a702 (patch) | |
| tree | 653fd9ea3b5c339a1ac1abf9f42aeb71d7ad3dd8 /synapse/api | |
| parent | Avoid cyclic dependency in handler setup (diff) | |
| parent | Fix typo in media repository doc string (diff) | |
| download | synapse-57b509454527752c2c4153a43294beb65a38a702.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/api')
| -rw-r--r-- | synapse/api/errors.py | 1 | ||||
| -rw-r--r-- | synapse/api/urls.py | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/synapse/api/errors.py b/synapse/api/errors.py index 581439ceb3..e250b9b211 100644 --- a/synapse/api/errors.py +++ b/synapse/api/errors.py @@ -34,6 +34,7 @@ class Codes(object): LIMIT_EXCEEDED = "M_LIMIT_EXCEEDED" CAPTCHA_NEEDED = "M_CAPTCHA_NEEDED" CAPTCHA_INVALID = "M_CAPTCHA_INVALID" + TOO_LARGE = "M_TOO_LARGE" class CodeMessageException(Exception): diff --git a/synapse/api/urls.py b/synapse/api/urls.py index 6dc19305b7..d7625127f8 100644 --- a/synapse/api/urls.py +++ b/synapse/api/urls.py @@ -20,3 +20,4 @@ FEDERATION_PREFIX = "/_matrix/federation/v1" WEB_CLIENT_PREFIX = "/_matrix/client" CONTENT_REPO_PREFIX = "/_matrix/content" SERVER_KEY_PREFIX = "/_matrix/key/v1" +MEDIA_PREFIX = "/_matrix/media/v1" |