diff options
| author | Erik Johnston <erik@matrix.org> | 2015-01-23 15:51:48 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-01-23 15:51:48 +0000 |
| commit | 9b1e552b5163aad84a3ae4fd70116d3e782fb443 (patch) | |
| tree | 19d827838d10688da26e3fa5503c63b71fd34db0 /tests/rest/__init__.py | |
| parent | Add storage method have_events (diff) | |
| parent | Update .gitignore (diff) | |
| download | synapse-9b1e552b5163aad84a3ae4fd70116d3e782fb443.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into rejections
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. - |