mirror of
https://github.com/odoo/documentation.git
synced 2025-12-12 07:29:27 +07:00
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>