diff options
| author | Mark Haines <mark.haines@matrix.org> | 2014-09-01 19:56:22 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2014-09-01 19:56:22 +0100 |
| commit | ff79437d9bceef3e6c824906a7588f3658e80e13 (patch) | |
| tree | 5b3fea43683e68d8e7ea246e97b9958f4a41913e /synapse/config/__init__.py | |
| parent | Follow API renaming. state -> presence. mtime_ago -> last_active_ago (diff) | |
| parent | Fix SSL for federation http client (diff) | |
| download | synapse-ff79437d9bceef3e6c824906a7588f3658e80e13.tar.xz | |
Merge branch 'server2server_tls' into develop
Diffstat (limited to 'synapse/config/__init__.py')
| -rw-r--r-- | synapse/config/__init__.py | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/synapse/config/__init__.py b/synapse/config/__init__.py new file mode 100644 index 0000000000..fe8a073cd3 --- /dev/null +++ b/synapse/config/__init__.py @@ -0,0 +1,14 @@ +# -*- 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. |