summary refs log tree commit diff
path: root/synapse/__init__.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-09-19 17:15:24 +0100
committerErik Johnston <erik@matrix.org>2016-09-19 17:15:24 +0100
commitddfcdd47780dacc19a8b6ba8316cc4b2c6628b9f (patch)
tree2b65d76c5b264d4a4cbcf7a3c5e08d260baad9e4 /synapse/__init__.py
parentUpdate changelog (diff)
parentMerge pull request #1131 from matrix-org/matthew/e2e-notifs (diff)
downloadsynapse-ddfcdd47780dacc19a8b6ba8316cc4b2c6628b9f.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.18.0
Diffstat (limited to 'synapse/__init__.py')
0 files changed, 0 insertions, 0 deletions