diff options
| author | Erik Johnston <erik@matrix.org> | 2015-02-11 10:33:19 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-02-11 10:33:19 +0000 |
| commit | fb233dc40b3111e905e394e627b8ecc3b2a91e80 (patch) | |
| tree | 931ab474f042b5eb5df9663306a4936406dcf17c /tests/rest/__init__.py | |
| parent | PEP8 (diff) | |
| parent | Merge branch 'master' of github.com:matrix-org/synapse into develop (diff) | |
| download | synapse-fb233dc40b3111e905e394e627b8ecc3b2a91e80.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into timeout-federation-requests
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. - |