summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2019-05-28 15:36:23 +0200
committerChristophe Simonis <chs@odoo.com>2019-05-28 15:52:00 +0200
commitcffd147cfd4767f57dc6deeb0a956361904e1b1b (patch)
tree8a5990635ca60e0f34fc59462ed694847714db5b /doc
parente9350993ca0b81df17308766d7e26d458bc39520 (diff)
parenta20a31486cd0b99755f8e6c27281ac6ba4758b7a (diff)
[MERGE] forward port branch 11.0 up to a20a31486cd
Diffstat (limited to 'doc')
-rw-r--r--doc/cla/corporate/acsone.md1
-rw-r--r--doc/cla/corporate/vauxoo.md1
2 files changed, 2 insertions, 0 deletions
diff --git a/doc/cla/corporate/acsone.md b/doc/cla/corporate/acsone.md
index d4ee1947927..25b0e1b1c8a 100644
--- a/doc/cla/corporate/acsone.md
+++ b/doc/cla/corporate/acsone.md
@@ -27,3 +27,4 @@ Thomas Binsfeld thomas.binsfeld@acsone.eu https://github.com/ThomasBinsfeld
Benjamin Willig benjamin.willig@acsone.eu https://github.com/benwillig
François Honoré francois.honore@acsone.eu https://github.com/acsonefho
Denis Robinet denis.robinet@acsone.eu https://github.com/RobinetDenisAcsone
+Benoit Aimont benoit.aimont@acsone.eu https://github.com/baimont
diff --git a/doc/cla/corporate/vauxoo.md b/doc/cla/corporate/vauxoo.md
index 512104ee2a6..4cf99d78176 100644
--- a/doc/cla/corporate/vauxoo.md
+++ b/doc/cla/corporate/vauxoo.md
@@ -44,3 +44,4 @@ Alexander Olivares alexander@vauxoo.com https://github.com/alxolivares
Jose Manuel Robles josemanuel@vauxoo.com https://github.com/keylor2906
Erick Birbe erick@vauxoo.com https://github.com/ebirbe
Tomas Alvarez tomas@vauxoo.com https://github.com/tomeyro
+Carmen Liliana Miranda González carmen@vauxoo.com https://github.com/CarmenMiranda