[MERGE] Sync with trunk

[odoo/odoo.git] / addons / mail / data / mail_data.xml

diff --git a/addons/mail/data/mail_data.xml b/addons/mail/data/mail_data.xml
index e1ca797..79754f5 100644 (file)
--- a/addons/mail/data/mail_data.xml
+++ b/addons/mail/data/mail_data.xml
@@ -51,6 +51,12 @@
             <field name="value">catchall</field>
         </record>
 
+        <!-- Bounce Email Alias -->
+        <record id="icp_mail_bounce_alias" model="ir.config_parameter">
+            <field name="key">mail.bounce.alias</field>
+            <field name="value">bounce</field>
+        </record>
+
         <!-- Discussion subtype for messaging / Chatter -->
         <record id="mt_comment" model="mail.message.subtype">
             <field name="name">Discussions</field>