diff options
| author | Richard van der Hoff <richard@matrix.org> | 2019-09-24 12:57:32 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2019-09-24 12:57:32 +0100 |
| commit | ed8b92f0d22b9de96c5ac04ef8ef45531fe45a2c (patch) | |
| tree | c6c35d841e75d73ed2a045d30d8abc87487a57ab /synapse/config/workers.py | |
| parent | Merge commit '33757bad1' into rav/saml_mapping_work (diff) | |
| parent | Add submit_url response parameter to msisdn /requestToken (#6079) (diff) | |
| download | synapse-ed8b92f0d22b9de96c5ac04ef8ef45531fe45a2c.tar.xz | |
Merge remote-tracking branch 'origin/develop' into rav/saml_mapping_work
Diffstat (limited to 'synapse/config/workers.py')
| -rw-r--r-- | synapse/config/workers.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/config/workers.py b/synapse/config/workers.py index bc0fc165e3..1ec4998625 100644 --- a/synapse/config/workers.py +++ b/synapse/config/workers.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright 2016 matrix.org +# Copyright 2016 OpenMarket Ltd # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. |