[IMP] Apply pre-commit changes: Resolve conflicts

This commit is contained in:
Alexandre D. Díaz 2021-01-26 17:37:52 +01:00 committed by Karl Southern
parent 3516f89553
commit 3325c2c329

View File

@ -6,7 +6,7 @@
Choose if you want to automatically add new recipients as followers Choose if you want to automatically add new recipients as followers
on mail.compose.message""", on mail.compose.message""",
"author": "ACSONE SA/NV," "Odoo Community Association (OCA)", "author": "ACSONE SA/NV," "Odoo Community Association (OCA)",
"website": "http://acsone.eu", "website": "https://github.com/OCA/social",
"category": "Social Network", "category": "Social Network",
"version": "13.0.1.0.0", "version": "13.0.1.0.0",
"license": "AGPL-3", "license": "AGPL-3",