diff options
| author | Christophe Simonis <chs@odoo.com> | 2019-05-08 18:29:32 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2019-05-08 18:29:32 +0200 |
| commit | 825fee2626c6cd756283b4fa40876cd1d3d5357a (patch) | |
| tree | 9bc5d3dd31fc9557985899a34fbffb5661caafbd /doc | |
| parent | 2c68df0ab43cb42e6762d7a1929471bf3f3df920 (diff) | |
| parent | d01db480872ea3705b3f0965beef79821b679acd (diff) | |
[MERGE] forward port branch 11.0 up to d01db480872
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/cla/corporate/tecnativa.md | 6 | ||||
| -rw-r--r-- | doc/reference/qweb.rst | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/doc/cla/corporate/tecnativa.md b/doc/cla/corporate/tecnativa.md index 9f3601d16a0..5249fe08571 100644 --- a/doc/cla/corporate/tecnativa.md +++ b/doc/cla/corporate/tecnativa.md @@ -17,7 +17,7 @@ Rafael Blasco rafael.blasco@tecnativa.com https://github.com/rafaelbn Sergio Teruel sergio.teruel@tecnativa.com https://github.com/sergio-teruel Carlos Dauden carlos.dauden@tecnativa.com https://github.com/carlosdauden Jairo Llopis jairo.llopis@tecnativa.com https://github.com/yajo -Vicent Cubells vicent.cubells@tecnativa.com https://github.com/cubells -Luis Montalba luis.montalba@tecnativa.com https://github.com/luismontalba David Vidal david.vidal@tecnativa.com https://github.com/chienandalu -Cristina Martín cristina.martin@tecnativa.com https://github.com/cristinamartinrod +Cristina Martín cristina.martin@tecnativa.com https://github.com/cristinamartinrod (up to 2019-04-30) +Ernesto Tejeda ernesto.tejeda@tecnativa.com https://github.com/ernestotejeda +Alexandre Díaz alexandre.diaz@tecnativa.com https://github.com/Tardo diff --git a/doc/reference/qweb.rst b/doc/reference/qweb.rst index a806c3fda8f..813866d9d0e 100644 --- a/doc/reference/qweb.rst +++ b/doc/reference/qweb.rst @@ -99,7 +99,7 @@ Extra conditional branching directives ``t-elif`` and ``t-else`` are also available:: <div> - <p t-if="user.birthday == today()">Happy bithday!</p> + <p t-if="user.birthday == today()">Happy birthday!</p> <p t-elif="user.login == 'root'">Welcome master!</p> <p t-else="">Welcome!</p> </div> |