summary refs log tree commit diff
path: root/synapse/replication/resource.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2017-04-03 14:58:14 +0100
committerErik Johnston <erik@matrix.org>2017-04-03 14:58:14 +0100
commit0d1c85e6432f2f736dd50e5520e684f8940c795b (patch)
treed1a31c46e9222fc193c141aa0b77e58a9fb57e6c /synapse/replication/resource.py
parentMerge pull request #2078 from APwhitehat/assertuserfriendly (diff)
parentBump version and changelog (diff)
downloadsynapse-0d1c85e6432f2f736dd50e5520e684f8940c795b.tar.xz
Merge branch 'release-v0.20.0' of github.com:matrix-org/synapse into develop
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions