summary refs log tree commit diff
path: root/synapse/replication/resource.py
diff options
context:
space:
mode:
authorMatthew Hodgson <matthew@matrix.org>2016-12-31 02:38:26 +0000
committerMatthew Hodgson <matthew@matrix.org>2016-12-31 02:38:26 +0000
commit899a3a126857e94a16fda65cd11b5b5c4efeed01 (patch)
tree56e3527cd9e9c62a71cee6d9064d3704f0e11ef2 /synapse/replication/resource.py
parentMerge remote-tracking branch 'origin/release-v0.18.6' into develop (diff)
parentBump version and changelog (diff)
downloadsynapse-899a3a126857e94a16fda65cd11b5b5c4efeed01.tar.xz
Merge branch 'release-v0.18.6' into develop
Diffstat (limited to 'synapse/replication/resource.py')
0 files changed, 0 insertions, 0 deletions