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

Browse Source

# Conflicts:
#	app_chatgpt/__manifest__.py
#	app_chatgpt/data/mail_channel_data.xml
#	app_chatgpt/data/user_partner_data.xml
#	app_chatgpt/static/description/index.html
#	app_chatgpt/views/res_users_views.xml

...

This commit is contained in:

ivan deng

2023-04-11 05:06:06 +08:00

parent 9368b3818b cdc1f23ee2

commit f98ca628ea

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available