diff options
| author | Denis Ledoux <dle@odoo.com> | 2016-02-15 17:00:11 +0100 |
|---|---|---|
| committer | Denis Ledoux <dle@odoo.com> | 2016-02-15 17:00:11 +0100 |
| commit | 493705bb77c1bf6be2c787a2ccb0c6fc18747155 (patch) | |
| tree | c54fd05d9d9f58f9edc39864a9cbfeec214ae61e /addons/website/data | |
| parent | cab5c480e204f7546646fd8884b72d2efa9e09f7 (diff) | |
| parent | c40070fb0262926193ffe9f062c924a5954d1f60 (diff) | |
[MERGE] forward port of branch 9.0 up to c40070f
Diffstat (limited to 'addons/website/data')
| -rw-r--r-- | addons/website/data/data.xml | 2 | ||||
| -rw-r--r-- | addons/website/data/demo.xml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/addons/website/data/data.xml b/addons/website/data/data.xml index 28617e9168d..407c4599d92 100644 --- a/addons/website/data/data.xml +++ b/addons/website/data/data.xml @@ -2,7 +2,7 @@ <openerp> <data noupdate="1"> <record id="default_website" model="website"> - <field name="name">localhost</field> + <field name="name">Website localhost</field> <field name="domain">localhost</field> <field name="company_id" ref="base.main_company"/> <field name="user_id" ref="base.public_user"/> diff --git a/addons/website/data/demo.xml b/addons/website/data/demo.xml index 10b80df08fa..adf1735dcd9 100644 --- a/addons/website/data/demo.xml +++ b/addons/website/data/demo.xml @@ -135,7 +135,7 @@ response = request.render("website.template_partner_comment", values) </record> <record id="website2" model="website"> - <field name="name">0.0.0.0</field> + <field name="name">Website 0.0.0.0</field> <field name="domain">0.0.0.0</field> <field name="social_twitter">https://twitter.com/Odoo</field> <field name="social_facebook">https://www.facebook.com/Odoo</field> |