diff options
author | Erik Johnston <erik@matrix.org> | 2015-02-17 15:15:07 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2015-02-17 15:15:07 +0000 |
commit | c02da58a9da5c617c80fbeb7205f163e7b410c6f (patch) | |
tree | 8b166570eb2cbbecb7640d92d072f31add922535 /synapse/rest/appservice/__init__.py | |
parent | Consume errors in time_bound_deferred (diff) | |
parent | Merge pull request #74 from matrix-org/federation_min_depth_fix (diff) | |
download | synapse-c02da58a9da5c617c80fbeb7205f163e7b410c6f.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into failures
Diffstat (limited to 'synapse/rest/appservice/__init__.py')
-rw-r--r-- | synapse/rest/appservice/__init__.py | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/synapse/rest/appservice/__init__.py b/synapse/rest/appservice/__init__.py new file mode 100644 index 0000000000..1a84d94cd9 --- /dev/null +++ b/synapse/rest/appservice/__init__.py @@ -0,0 +1,14 @@ +# -*- 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. |