<NME> odoo
<BEF> Maintainers: Christophe Monniez <moc@odoo.com> (@d-fence)
GitRepo: https://github.com/odoo/docker
GitCommit: e34689bf67b64f7ee9fadaf984d0e532594ad4e5

Tags: 11.0, 11, latest
Architectures: amd64, arm64v8
Directory: 11.0

Tags: 14.0, 14
Architectures: amd64
Directory: 14.0


<MSG> Merge pull request #4912 from odoo/master

Odoo: Add Odoo 12.0
<DFF> @@ -1,8 +1,12 @@
 Maintainers: Christophe Monniez <moc@odoo.com> (@d-fence)
 GitRepo: https://github.com/odoo/docker
-GitCommit: e34689bf67b64f7ee9fadaf984d0e532594ad4e5
+GitCommit: a7e2eb4193e9e1de98ce9e3e7462593a49c191a8
 
-Tags: 11.0, 11, latest
+Tags: 12.0, 12, latest
+Architectures: amd64, arm64v8
+Directory: 12.0
+
+Tags: 11.0, 11
 Architectures: amd64, arm64v8
 Directory: 11.0
 

Merge pull request #4912 from odoo/master