diff options
| author | Erik Johnston <erik@matrix.org> | 2019-04-26 18:14:23 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2019-04-26 18:14:23 +0100 |
| commit | d6118c5be61aed49f1aa3fac53a25a670bbbd245 (patch) | |
| tree | 269071e6c6a87cc70a177f48f9546e97a5b0f1e2 /synapse/api/urls.py | |
| parent | Newsfile (diff) | |
| parent | Merge pull request #5103 from matrix-org/rav/fix_notif_loop (diff) | |
| download | synapse-d6118c5be61aed49f1aa3fac53a25a670bbbd245.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/ratelimit_3pid_invite
Diffstat (limited to 'synapse/api/urls.py')
| -rw-r--r-- | synapse/api/urls.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/api/urls.py b/synapse/api/urls.py index 8102176653..cb71d80875 100644 --- a/synapse/api/urls.py +++ b/synapse/api/urls.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Copyright 2014-2016 OpenMarket Ltd -# Copyright 2018 New Vector Ltd. +# Copyright 2018 New Vector Ltd # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. |