Merge branch 'Web_Manager_Develope' of https://git.trustie.net/fhx569287825/aggregation-platform into Web_Manager_Develope

9 years ago · b5f6f9c8d3
parent 124e72cd0d 673bd343e0
commit b5f6f9c8d3
3 changed files with 2 additions and 2 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,5 +1,5 @@
-node_modules/
+libs
-libs/
+node_modules
 site/
 .idea
 *.cer
--- a/libs.rar
+++ b/libs.rar
--- a/node_modules.rar
+++ b/node_modules.rar