Merge branch 'master' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl

pirms 4 gadiem · 296459bbc0
--- a/.gitignore
+++ b/.gitignore
@@ -77,3 +77,4 @@ unpackage
 Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js
 /Learun.Framework.Ultimate V7/Learun.Application.Web/Resource/
 /Learun.Framework.Ultimate V7/Learun.Application.Mobile/platforms/android/assets/www
 /Learun.Framework.Ultimate V7/Learun.Application.Mobile/www.7z
--- a/V7/Learun.Application.Mobile/www.7z
+++ b/V7/Learun.Application.Mobile/www.7z