Merge remote-tracking branch 'origin/13.0' into 13.0

# Conflicts:
#	app_odoo_customize/__manifest__.py
This commit is contained in:
ivanOffice
2024-03-05 17:53:58 +08:00

View File

@@ -133,7 +133,7 @@
'base_setup', 'base_setup',
'portal', 'portal',
'mail', 'mail',
'iap', # 'iap',
# 'digest', # 'digest',
# when enterprise # when enterprise
# 'web_mobile' # 'web_mobile'