diff options
| author | Erik Johnston <erik@matrix.org> | 2015-02-12 11:42:43 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-02-12 11:42:43 +0000 |
| commit | 1ed836cc2b909e0bcd439964173008e9755c4750 (patch) | |
| tree | 65862dbcf81107332c0c7c65a2eda86eb6afc9ba /tests/rest/__init__.py | |
| parent | Merge pull request #59 from matrix-org/hotfixes-v0.6.1f (diff) | |
| parent | Expand on caching (diff) | |
| download | synapse-1ed836cc2b909e0bcd439964173008e9755c4750.tar.xz | |
Merge branch 'release-v0.7.0' of github.com:matrix-org/synapse v0.7.0
Diffstat (limited to 'tests/rest/__init__.py')
| -rw-r--r-- | tests/rest/__init__.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/rest/__init__.py b/tests/rest/__init__.py index 9bff9ec169..1a84d94cd9 100644 --- a/tests/rest/__init__.py +++ b/tests/rest/__init__.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright 2014 OpenMarket Ltd +# Copyright 2015 OpenMarket Ltd # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -12,4 +12,3 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - |