diff options
| author | H. Shay <hillerys@element.io> | 2022-10-06 12:09:53 -0700 |
|---|---|---|
| committer | H. Shay <hillerys@element.io> | 2022-10-06 12:09:53 -0700 |
| commit | ece0f566e8f78d72df5915e9ba0e19940409161d (patch) | |
| tree | b6f15a752b25cfbfca397e2924a14625c1621186 /changelog.d/3355.bugfix | |
| parent | Merge branch 'develop' into shay/more_batching (diff) | |
| download | synapse-ece0f566e8f78d72df5915e9ba0e19940409161d.tar.xz | |
fix merge conflict
Diffstat (limited to 'changelog.d/3355.bugfix')
0 files changed, 0 insertions, 0 deletions