Skip to content

Resolve weblate merge conflicts

rinpatch requested to merge resolve-weblate-merge-conflicts into develop

A typo in english translation was fixed, causing weblate to reformat the whole file, but this file was also changed in develop via an MR, causing a merge conflict on weblate side

Merge request reports