Merge remote-tracking branch 'origin/13.0' into 14.0-oh-forward-port-from-13.0-x-9Zi0

c9be7f66 · Dmytro Katyukha · 8ed19f45 · 8ac378cd · c9be7f66 · 8ed19f45
Commit c9be7f66 authored 1 year ago by Dmytro Katyukha
Hide whitespace changes
Inline Side-by-side

Showing

with 2 additions and 2 deletions
+2 -2
--- a/generic_condition/__manifest__.py
+++ b/generic_condition/__manifest__.py
 {
    "name": "Generic Condition",
-    "version": "14.0.1.19.0",
+    "version": "14.0.1.20.0",
    "author": "Center of Research and Development",
    "website": "https://crnd.pro",
    "license": "LGPL-3",

--- a/generic_condition/static/description/banner.png
+++ b/generic_condition/static/description/banner.png
--- a/generic_condition/static/description/icon.png
+++ b/generic_condition/static/description/icon.png
--- a/generic_service/__manifest__.py
+++ b/generic_service/__manifest__.py
@@ -8,7 +8,7 @@
    'author': "Center of Research and Development",
    'website': "https://crnd.pro",
    'category': 'Generic Service',
-    'version': '14.0.1.26.0',
+    'version': '14.0.1.27.0',

    # any module necessary for this one to work correctly
    'depends': [

--- a/generic_service/static/description/banner.png
+++ b/generic_service/static/description/banner.png
--- a/generic_service/static/description/icon.png
+++ b/generic_service/static/description/icon.png