Files
odoo-docs/locale
Dylan Kiss (dyki) cdeed30273 [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.

closes odoo/documentation#15544

Signed-off-by: Tiffany Chang (tic) <tic@odoo.com>
2025-12-02 10:21:02 +00:00
..
2025-11-19 14:22:35 +00:00