diff options
author | David Baker <dave@matrix.org> | 2015-04-17 13:51:10 +0100 |
---|---|---|
committer | David Baker <dave@matrix.org> | 2015-04-17 13:51:10 +0100 |
commit | cb03fafdf150cb97d494c1a12efb730e01309fb2 (patch) | |
tree | 5c6994f2ec826599984d7a621caeb889aeef4c57 /synapse/rest/key/__init__.py | |
parent | Register the 3pid servlet (diff) | |
parent | Filter typing nofication events to only those rooms the requesting user is a ... (diff) | |
download | synapse-cb03fafdf150cb97d494c1a12efb730e01309fb2.tar.xz |
Merge branch 'develop' into csauth
Diffstat (limited to 'synapse/rest/key/__init__.py')
-rw-r--r-- | synapse/rest/key/__init__.py | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/synapse/rest/key/__init__.py b/synapse/rest/key/__init__.py new file mode 100644 index 0000000000..1a84d94cd9 --- /dev/null +++ b/synapse/rest/key/__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. |