mirror of
https://github.com/element-hq/synapse.git
synced 2025-03-14 19:58:42 +00:00
Fixes a merge conflict with debian/changelog Signed-off-by: Dan Callahan <danc@element.io> |
||
---|---|---|
.. | ||
.gitignore | ||
10943.misc | ||
10969.bugfix | ||
11126.feature | ||
11166.misc | ||
11187.feature | ||
11191.bugfix | ||
11194.misc |