summary refs log tree commit diff
path: root/synapse/replication/resource.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2017-03-16 13:05:27 +0000
committerErik Johnston <erik@matrix.org>2017-03-16 13:05:27 +0000
commitbbc0dbeec0ed87e3a6a749c5eca183dfe32f86d7 (patch)
tree75ba21740a4c5309960ea4d1989e0768b291245e /synapse/replication/resource.py
parentMerge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes (diff)
parentMerge pull request #2022 from matrix-org/erikj/no_op_sync (diff)
downloadsynapse-bbc0dbeec0ed87e3a6a749c5eca183dfe32f86d7.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'synapse/replication/resource.py')
0 files changed, 0 insertions, 0 deletions