diff options
| author | Erik Johnston <erik@matrix.org> | 2016-11-23 11:31:53 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-11-23 11:31:53 +0000 |
| commit | b69f76c1069ac4daa570102ab3dac0bf08e8dcc1 (patch) | |
| tree | b3b53d30e85bc26946c988ccc478f130b6f1c452 /synapse/__init__.py | |
| parent | Comment (diff) | |
| parent | Merge pull request #1640 from matrix-org/kegan/sync-perf (diff) | |
| download | synapse-b69f76c1069ac4daa570102ab3dac0bf08e8dcc1.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_out_fed_txn
Diffstat (limited to 'synapse/__init__.py')
| -rw-r--r-- | synapse/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py |