diff options
| author | Erik Johnston <erik@matrix.org> | 2014-09-01 19:57:28 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-09-01 19:57:28 +0100 |
| commit | f452899fe2a1bcf3f9d3313eeb108660b5cbf677 (patch) | |
| tree | edae89fefddc1f820f5bcae8409a85c36f1b2a0e /synapse/config/__init__.py | |
| parent | Fix the tests to include new db calls (diff) | |
| parent | Merge branch 'server2server_tls' into develop (diff) | |
| download | synapse-f452899fe2a1bcf3f9d3313eeb108660b5cbf677.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into room_config
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. |