odoo/documentation#15544
Created by Accounting, Dylan Kiss (dyki)
Merged
at cdeed3027365f2dd8986a2f093641f9792004254
Statuses:
- ci/documentation: (runtime 1056s)
- ci/codeowner_coverage: (runtime 6s)
- label
- odoo-dev:19.0-fix-weblate-merge-conflict-dyki
- head
- 53d82d8572b31a130c91e637fedcd89d389d59c2
- merged
- 1 week ago by Logistics, Tiffany Chang (tic)
| odoo/documentation | |
|---|---|
| 19.0 | #15544 |
[I18N] *: fix Weblate merge conflicts
Due to translations being changed during the sync, a merge conflict happened while squashing commits in Weblate.
This commit fixes that by incorporating the latest Weblate changes, so we can reset Weblate to the changes in GitHub.