diff options
| author | Matthew Hodgson <matthew@matrix.org> | 2016-02-10 16:27:15 +0000 |
|---|---|---|
| committer | Matthew Hodgson <matthew@matrix.org> | 2016-02-10 16:27:15 +0000 |
| commit | 76346870571ce885d07b180cf88c11a33a051cf8 (patch) | |
| tree | 832664ad8351517a43bd91230eeacf257b2c0bec /synapse/config/appservice.py | |
| parent | try to bump syweb to 0.6.8 (diff) | |
| parent | Merge branch 'release-v0.13.0' of github.com:matrix-org/synapse (diff) | |
| download | synapse-76346870571ce885d07b180cf88c11a33a051cf8.tar.xz | |
Merge branch 'master' of git+ssh://github.com/matrix-org/synapse
Diffstat (limited to 'synapse/config/appservice.py')
| -rw-r--r-- | synapse/config/appservice.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/config/appservice.py b/synapse/config/appservice.py index b8d301995e..3bed542c4f 100644 --- a/synapse/config/appservice.py +++ b/synapse/config/appservice.py @@ -1,4 +1,4 @@ -# Copyright 2015 OpenMarket Ltd +# Copyright 2015, 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. |