summary refs log tree commit diff
path: root/tests
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-01-26 16:32:40 +0000
committerMark Haines <mark.haines@matrix.org>2015-01-26 16:32:40 +0000
commit3186c5bdbc49cf7cbca3ae0b45bc8657b069a9a8 (patch)
treedd7ba7aeb2be210a86668a7dc675627b17ec721e /tests
parentAdd handler for /sync API (diff)
parentMerge pull request #34 from matrix-org/remove_serialize_event_from_hs (diff)
downloadsynapse-3186c5bdbc49cf7cbca3ae0b45bc8657b069a9a8.tar.xz
Merge branch 'develop' into client_v2_sync
Diffstat (limited to 'tests')
-rw-r--r--tests/rest/client/v2_alpha/__init__.py15
1 files changed, 15 insertions, 0 deletions
diff --git a/tests/rest/client/v2_alpha/__init__.py b/tests/rest/client/v2_alpha/__init__.py
new file mode 100644

index 0000000000..803f97ea4f --- /dev/null +++ b/tests/rest/client/v2_alpha/__init__.py
@@ -0,0 +1,15 @@ +# -*- coding: utf-8 -*- +# 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. +# 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. +