diff options
| author | Erik Johnston <erik@matrix.org> | 2015-03-09 13:29:41 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-03-09 13:29:41 +0000 |
| commit | f31e65ca8b3a056b81c9ee1c8e5be298e36ed495 (patch) | |
| tree | 414d6a488f090cea0aff41ef8ca7346f47567a62 /tests/rest/__init__.py | |
| parent | Merge branch 'develop' of github.com:matrix-org/synapse into erikj-perf (diff) | |
| parent | D'oh: underscore, not hyphen (diff) | |
| download | synapse-f31e65ca8b3a056b81c9ee1c8e5be298e36ed495.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj-perf
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. - |