summary refs log tree commit diff
path: root/synapse/__init__.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2018-09-06 14:13:58 +0100
committerErik Johnston <erik@matrix.org>2018-09-06 14:13:58 +0100
commit599f65bb895337d38d67e1e6242085f2d7a4d567 (patch)
treefda260c8585a01f3f3a3bac403375f5c54ff8a05 /synapse/__init__.py
parentBump version and changelog (diff)
parentMerge tag 'v0.33.3.1' (diff)
downloadsynapse-599f65bb895337d38d67e1e6242085f2d7a4d567.tar.xz
Merge branch 'master' of github.com:matrix-org/synapse into release-v0.33.4 v0.33.4rc2
Diffstat (limited to 'synapse/__init__.py')
0 files changed, 0 insertions, 0 deletions