Merge branch 'feature/ci_jenkins' into 'develop'

Feature/ci jenkins See merge request o2oa/o2oa!79

Merge branch 'feature/ci_jenkins' into 'develop'
Feature/ci jenkins See merge request o2oa/o2oa!79
0c05a179 · NoSubject · a9852a84 · 295ddb8a · 0c05a179 · 0c05a179
隐藏空白更改
内联并排

Showing with 5 addition and 1 deletion

.gitignore .gitignore +2 -0

o2web/.gitignore o2web/.gitignore +3 -1

未找到文件。
--- a/.gitignore
+++ b/.gitignore
@@ -154,3 +154,5 @@ typings/
 .factorypath
 /o2server/commons/
 /o2server/jvm/
+/o2web/ftpconfig.js
+/o2web/gulpconfig.js
--- a/o2web/.gitignore
+++ b/o2web/.gitignore
@@ -9,5 +9,7 @@ npm-debug.log
 **/*.min.js
 package-lock.json
 /.svn/
+/ftpconfig.js
+/gulpconfig.js
 ftpconfig.js
-gulpconfig.js
\ No newline at end of file
+gulpconfig.js