diff options
| author | Erik Johnston <erik@matrix.org> | 2017-05-16 15:33:07 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2017-05-16 15:33:07 +0100 |
| commit | 331570ea6f97d570cf2774cd0700eb588e9fb1d7 (patch) | |
| tree | 5427c59e91d8110c1c55db9c875a7ef690ef997d /res | |
| parent | Take a copy before prefilling, as it may be a frozendict (diff) | |
| download | synapse-331570ea6f97d570cf2774cd0700eb588e9fb1d7.tar.xz | |
Remove spurious merge artifacts
Diffstat (limited to 'res')
0 files changed, 0 insertions, 0 deletions