Merge commit 'refs/pull/89/head' of github.com:camptocamp/odoo-cloud-platform into merge-branch-2757-master-6cfa4609

This commit is contained in:
Thierry Ducrest
2019-11-01 09:53:28 +01:00
2 changed files with 5 additions and 3 deletions
+3 -3
View File
@@ -1,8 +1,8 @@
# Copyright 2016-2018 Camptocamp SA # Copyright 2016-2019 Camptocamp SA
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html)
{'name': 'JSON Logging', {'name': 'JSON Logging',
'version': '12.0.1.0.0', 'version': '13.0.1.0.0',
'author': 'Camptocamp,Odoo Community Association (OCA)', 'author': 'Camptocamp,Odoo Community Association (OCA)',
'license': 'AGPL-3', 'license': 'AGPL-3',
'category': 'Extra Tools', 'category': 'Extra Tools',
@@ -13,5 +13,5 @@
}, },
'website': 'http://www.camptocamp.com', 'website': 'http://www.camptocamp.com',
'data': [], 'data': [],
'installable': False, 'installable': True,
} }
+2
View File
@@ -1,3 +1,5 @@
# Copyright 2016-2019 Camptocamp SA
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html)
import logging import logging
import os import os