diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-06-13 10:55:58 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-06-13 10:55:58 +0200 |
| commit | c43c54017259fb756f5449abf115c514b49ed371 (patch) | |
| tree | 1a2223b8423c4a56d44030fbb4dfe0b65ae5b345 /doc | |
| parent | 284ed9216c9f8bb0796b5e3350274a971874c757 (diff) | |
| parent | 788750ea513cb013db2d684b985efdb2e66dc5a7 (diff) | |
[MERGE] forward port branch 10.0 up to 788750ea513
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/cla/corporate/eficent.md | 3 | ||||
| -rw-r--r-- | doc/cla/individual/subodhdahal.md | 11 | ||||
| -rw-r--r-- | doc/howtos/themes.rst | 2 |
3 files changed, 14 insertions, 2 deletions
diff --git a/doc/cla/corporate/eficent.md b/doc/cla/corporate/eficent.md index 3723fbf0740..2b5b8c830c4 100644 --- a/doc/cla/corporate/eficent.md +++ b/doc/cla/corporate/eficent.md @@ -14,6 +14,7 @@ List of contributors: Aarón Henríquez ahenriquez@eficent.com https://github.com/aheficent Lois Rilo lois.rilo@eficent.com https://github.com/lreficent -Gisela Mora gisela.mora@eficent.com https://github.com/gmeficent Miquel Raich miquel.raich@eficent.com https://github.com/mreficent Jordi Ballester jordi.ballester@eficent.com https://github.com/jbeficent +Hector Villarreal hector.villarreal@eficent.com https://github.com/hveficent +Roser Garcia roser.garcia@eficent.com https://github.com/rgarnau (up to 2018-05-01) diff --git a/doc/cla/individual/subodhdahal.md b/doc/cla/individual/subodhdahal.md new file mode 100644 index 00000000000..4e4c389bc99 --- /dev/null +++ b/doc/cla/individual/subodhdahal.md @@ -0,0 +1,11 @@ +Nepal, 2018-02-09 + +I hereby agree to the terms of the Odoo Individual Contributor License +Agreement v1.0. + +I declare that I am authorized and able to make this agreement and sign this +declaration. + +Signed, + +Subodh Dahal contact.subodhdahal@gmail.com https://github.com/SubodhDahal diff --git a/doc/howtos/themes.rst b/doc/howtos/themes.rst index 531f5e2c8f0..e2dc46f647b 100644 --- a/doc/howtos/themes.rst +++ b/doc/howtos/themes.rst @@ -614,7 +614,7 @@ The previous code will create the snippet’s content, but we still need to plac .. code-block:: xml <template id="place_into_bar" inherit_id="website.snippets" name="Place into bar"> - <xpath expr="//div[@id='snippet_content']/div[@class='o_panel_body']" position="inside"> + <xpath expr="//div[@id='snippet_structure']/div[@class='o_panel_body']" position="inside"> <t t-snippet="theme_tutorial.snippet_testimonial" t-thumbnail="/theme_tutorial/static/src/img/ui/snippet_thumb.jpg"/> </xpath> |