Merge branch 'master' into feature/tenant

package-lock.json

@@ -2103,9 +2103,9 @@
       }
     },
     "@qg/citrus-ui": {
-      "version": "0.3.18-beta1",
-      "resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.3.18-beta1.tgz",
-      "integrity": "sha512-n3dZODThvGOnBJcUBmj6mgf3NFNgtaeE568ihwgm9LP/nBILOh9hco8EsNFmuE4RBx/il3mtyewKjoGilkbR5A==",
+      "version": "0.3.16-bata1",
+      "resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.3.16-bata1.tgz",
+      "integrity": "sha512-RZDGb116hiIGNV2MFkXhqrs4Mlje5zYGtsMbHLRs56sgHtrjHCfcgRtdDbiNmJBKMobSgY4TddT0Hb7TmJiaTQ==",
       "requires": {
         "@better-scroll/core": "^2.1.1",
         "@qg/cherry-ui": "^2.23.9",

package.json

@@ -29,9 +29,7 @@
     "@hubcarl/json-typescript-mapper": "^2.0.0",
     "@qg/apollo-nodejs": "^2.1.2",
     "@qg/cherry-ui": "2.23.10",
-    "@qg/citrus-ui": "0.3.18-beta2",
-    "@commitlint/cli": "^13.2.1",
-    "@commitlint/config-angular": "^13.2.0",
+    "@qg/citrus-ui": "0.3.16-bata2",
     "@riophae/vue-treeselect": "^0.4.0",
     "@types/lodash": "^4.14.117",
     "@types/node": "^10.12.0",