diff options
| author | Mark Haines <mark.haines@matrix.org> | 2014-08-27 17:15:58 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2014-08-27 17:15:58 +0100 |
| commit | 2aeaa7b77c0c39f12c89b0054049970faad28406 (patch) | |
| tree | f3022ab73ea75827dfec17de532fb07b0949196f /synapse/streams/__init__.py | |
| parent | Return the store_id from persist_event (diff) | |
| parent | Merge branch 'develop' of github.com:matrix-org/synapse into develop (diff) | |
| download | synapse-2aeaa7b77c0c39f12c89b0054049970faad28406.tar.xz | |
Merge branch 'develop' into storage_transactions
Conflicts: synapse/handlers/room.py synapse/storage/stream.py
Diffstat (limited to 'synapse/streams/__init__.py')
| -rw-r--r-- | synapse/streams/__init__.py | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/synapse/streams/__init__.py b/synapse/streams/__init__.py new file mode 100644 index 0000000000..fe8a073cd3 --- /dev/null +++ b/synapse/streams/__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. |