diff options
| author | Matthew Hodgson <matthew.hodgson@openmarket.com> | 2014-08-13 16:14:30 +0100 |
|---|---|---|
| committer | Matthew Hodgson <matthew.hodgson@openmarket.com> | 2014-08-13 16:14:30 +0100 |
| commit | 2ec5f6c2f2bccca6fe3004fd7d4c2632428a4ba5 (patch) | |
| tree | 93449489f2a1244b4f807f79fed5e23446d60e56 /tests/handlers/test_room.py | |
| parent | timestamps (diff) | |
| parent | Don't pass host_web_client flag to register_servlets, it needs to be a Resour... (diff) | |
| download | synapse-2ec5f6c2f2bccca6fe3004fd7d4c2632428a4ba5.tar.xz | |
Merge branch 'master' of git+ssh://github.com/matrix-org/synapse
Diffstat (limited to 'tests/handlers/test_room.py')
| -rw-r--r-- | tests/handlers/test_room.py | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/tests/handlers/test_room.py b/tests/handlers/test_room.py index 26b233bccd..99067da6a5 100644 --- a/tests/handlers/test_room.py +++ b/tests/handlers/test_room.py @@ -1,4 +1,18 @@ # -*- coding: utf-8 -*- +# Copyright 2014 matrix.org +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# 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. + from twisted.internet import defer from twisted.trial import unittest |