Merge branch 'feature/CMS.merge_form_component' into 'wrdp'

Merge of feature/CMS.merge_form_component to wrdp

See merge request o2oa/o2oa!2700

o2web/.gitignore

@@ -15,3 +15,4 @@ package-lock.json
 /gulpconfig.js
 ftpconfig.js
 gulpconfig.js
+jsdoc.dev.json

package.json

@@ -73,6 +73,6 @@
                 "request": "^2.88.2",
                 "single-line-log": "^1.1.2",
                 "targz": "^1.0.1",
-                "tidy-jsdoc-o2": "0.0.1"
+                "tidy-jsdoc-o2": "^0.0.5"
         }
 }