summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorOlivier Dony <odo@openerp.com>2017-05-30 13:52:05 +0200
committerOlivier Dony <odo@openerp.com>2017-05-30 13:52:05 +0200
commit7b5af174a550f08b5b7a7624d9d6893ffbc02f52 (patch)
tree30a8f32aa9f9ade4fc47b4cbce12aae55c4b5cdc /doc
parent7dc2ed94c31100b1eeb38ec86cf82703d0e37423 (diff)
parent2fc7eed0d80b0cb9aafada0fcfad6209f89c5c5a (diff)
[MERGE] Forward-port 8.0 up to 2fc7eed0d80b0cb9aafada0fcfad6209f89c5c5a
Diffstat (limited to 'doc')
-rw-r--r--doc/cla/corporate/savoirfairelinux.md29
-rw-r--r--doc/cla/individual/JesusVMayor.md2
2 files changed, 17 insertions, 14 deletions
diff --git a/doc/cla/corporate/savoirfairelinux.md b/doc/cla/corporate/savoirfairelinux.md
index 31be8b5f9b8..784518b093e 100644
--- a/doc/cla/corporate/savoirfairelinux.md
+++ b/doc/cla/corporate/savoirfairelinux.md
@@ -1,4 +1,4 @@
-Canada, France, 8-2-2015
+Canada, France, 2017-05-12
Savoir-faire Linux agrees to the terms of the Odoo Corporate Contributor License
Agreement v1.0.
@@ -8,22 +8,25 @@ declaration.
Signed,
-Maxime Chambreuil partners@savoirfairelinux.com https://github.com/savoirfairelinux
+Jérome Boisvert-Chouinard jerome.boisvertchouinard@savoirfairelinux.com https://github.com/jbchouinard
List of contributors:
+Agathe Mollé agathe.molle@savoirfairelinux.com https://github.com/Ehtaga
Bruno Joliveau bruno.joliveau@savoirfairelinux.com https://github.com/bjoliveau
-David Cormier david.cormier@savoirfairelinux.com https://github.com/cormier
David Dufresne david.dufresne@savoirfairelinux.com https://github.com/dufresnedavid
-Davin Baragiotta davin.baragiotta@savoirfairelinux.com https://github.com/giotta
-El Hadji Dem elhadji.dem@savoirfairelinux.com https://github.com/ehdem
-Guillaume Auger guillaume.auger@savoirfairelinux.com https://github.com/jehog
+Jérome Boisvert-Chouinard jerome.boisvertchouinard@savoirfairelinux.com https://github.com/jbchouinard
Joao Alfredo Gama Batista joao.gama@savoirfairelinux.com https://github.com/joaoalf
-Jordi Riera jordi.riera@savoirfairelinux.com https://github.com/foutoucour
-Julien Roux julien.roux@savoirfairelinux.com https://github.com/jrouxsfl
-Loïc Faure-Lacroix loic.lacroix@savoirfairelinux.com https://github.com/llacroix
-Maxime Chambreuil maxime.chambreuil@savoirfairelinux.com https://github.com/max3903
-Pierre Gault pierre.gault@savoirfairelinux.com https://github.com/gaultp
+Julie Moussu julie.mousse@savoirfairelinux.com https://github.com/JulieSFL
Pierre Lamarche pierre.lamarche@savoirfairelinux.com https://github.com/plamarche
-Sandy Carter sandy.carter@savoirfairelinux.com https://github.com/bwrsandman
-Vincent Vinet vincent.vinet@savoirfairelinux.com https://github.com/veloutin
+David Cormier david.cormier@savoirfairelinux.com https://github.com/cormier (up to 2017-05-12)
+Davin Baragiotta davin.baragiotta@savoirfairelinux.com https://github.com/giotta (up to 2017-05-12)
+El Hadji Dem elhadji.dem@savoirfairelinux.com https://github.com/ehdem (up to 2017-05-12)
+Guillaume Auger guillaume.auger@savoirfairelinux.com https://github.com/jehog (up to 2017-05-12)
+Jordi Riera jordi.riera@savoirfairelinux.com https://github.com/foutoucour (up to 2017-05-12)
+Julien Roux julien.roux@savoirfairelinux.com https://github.com/jrouxsfl (up to 2017-05-12)
+Loïc Faure-Lacroix loic.lacroix@savoirfairelinux.com https://github.com/llacroix (up to 2017-05-12)
+Maxime Chambreuil maxime.chambreuil@savoirfairelinux.com https://github.com/max3903 (up to 2017-05-12)
+Pierre Gault pierre.gault@savoirfairelinux.com https://github.com/gaultp (up to 2017-05-12)
+Sandy Carter sandy.carter@savoirfairelinux.com https://github.com/bwrsandman (up to 2017-05-12)
+Vincent Vinet vincent.vinet@savoirfairelinux.com https://github.com/veloutin (up to 2017-05-12)
diff --git a/doc/cla/individual/JesusVMayor.md b/doc/cla/individual/JesusVMayor.md
index c009f323be9..456778e94f5 100644
--- a/doc/cla/individual/JesusVMayor.md
+++ b/doc/cla/individual/JesusVMayor.md
@@ -9,4 +9,4 @@ declaration.
Signed,
Jesús Ventosinos Mayor jesus@pexego.es https://github.com/jesusVMayor
-
+Jesús Ventosinos Mayor jesus@comunitea.com https://github.com/jesusVMayor