summary refs log tree commit diff
path: root/synapse/app
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2017-05-16 15:33:07 +0100
committerErik Johnston <erik@matrix.org>2017-05-16 15:33:07 +0100
commit331570ea6f97d570cf2774cd0700eb588e9fb1d7 (patch)
tree5427c59e91d8110c1c55db9c875a7ef690ef997d /synapse/app
parentTake a copy before prefilling, as it may be a frozendict (diff)
downloadsynapse-331570ea6f97d570cf2774cd0700eb588e9fb1d7.tar.xz
Remove spurious merge artifacts
Diffstat (limited to 'synapse/app')
0 files changed, 0 insertions, 0 deletions