diff options
author | Erik Johnston <erik@matrix.org> | 2016-11-01 14:18:07 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2016-11-01 14:18:07 +0000 |
commit | 0aeb1324b7d1b690c24d11d4babb96bbc403ddb6 (patch) | |
tree | f5d146248431ce35f1ad810267024af4eb907bdf /synapse | |
parent | Merge pull request #1184 from matrix-org/paul/metrics (diff) | |
parent | Bump version and changelog (diff) | |
download | synapse-0aeb1324b7d1b690c24d11d4babb96bbc403ddb6.tar.xz |
Merge branch 'release-v0.18.2' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse')
-rw-r--r-- | synapse/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py |