преди 2 години · d5c6865d53
--- a/public/backup/91APP/css/normalize.min.css
+++ b/public/backup/91APP/css/normalize.min.css
--- a/public/backup/91APP/css/style.css
+++ b/public/backup/91APP/css/style.css
--- a/public/backup/91APP/images/share.jpg
+++ b/public/backup/91APP/images/share.jpg
--- a/public/backup/91APP/index.html
+++ b/public/backup/91APP/index.html
--- a/public/backup/91APP/js/libs/TweenMax.min.js
+++ b/public/backup/91APP/js/libs/TweenMax.min.js
--- a/public/backup/91APP/js/libs/easing/EasePack.min.js
+++ b/public/backup/91APP/js/libs/easing/EasePack.min.js
--- a/public/backup/91APP/js/libs/jquery-1.11.1.min.js
+++ b/public/backup/91APP/js/libs/jquery-1.11.1.min.js
--- a/public/backup/91APP/js/libs/jquery-1.11.1.min.map
+++ b/public/backup/91APP/js/libs/jquery-1.11.1.min.map
--- a/public/backup/91APP/js/libs/jquery.nicescroll.min.js
+++ b/public/backup/91APP/js/libs/jquery.nicescroll.min.js
--- a/public/backup/91APP/js/libs/modernizr-2.6.2-respond-1.1.0.min.js
+++ b/public/backup/91APP/js/libs/modernizr-2.6.2-respond-1.1.0.min.js
--- a/public/backup/91APP/js/main.js
+++ b/public/backup/91APP/js/main.js
--- a/public/backup/91APP/js/simplePage.js
+++ b/public/backup/91APP/js/simplePage.js
--- a/public/backup/91APP/js/templete.js
+++ b/public/backup/91APP/js/templete.js
--- a/public/backup/91APP/js/utlis.js
+++ b/public/backup/91APP/js/utlis.js
--- a/public/backup/_index.html
+++ b/public/backup/_index.html
--- a/public/backup/assets/css/_base.scss
+++ b/public/backup/assets/css/_base.scss
--- a/public/backup/assets/css/_common.scss
+++ b/public/backup/assets/css/_common.scss
--- a/public/backup/assets/css/_container.scss
+++ b/public/backup/assets/css/_container.scss
--- a/public/backup/assets/css/_module.scss
+++ b/public/backup/assets/css/_module.scss
--- a/public/backup/assets/css/base/_base.scss
+++ b/public/backup/assets/css/base/_base.scss
--- a/public/backup/assets/css/base/_color.scss
+++ b/public/backup/assets/css/base/_color.scss
--- a/public/backup/assets/css/base/_func.scss
+++ b/public/backup/assets/css/base/_func.scss
--- a/public/backup/assets/css/base/_mediaQuery.scss
+++ b/public/backup/assets/css/base/_mediaQuery.scss
--- a/public/backup/assets/css/container/_mergePage.scss
+++ b/public/backup/assets/css/container/_mergePage.scss
--- a/public/backup/assets/css/container/_photographPage.scss
+++ b/public/backup/assets/css/container/_photographPage.scss
--- a/public/backup/assets/css/container/_sharePage.scss
+++ b/public/backup/assets/css/container/_sharePage.scss
--- a/public/backup/assets/css/container/_templatePage.scss
+++ b/public/backup/assets/css/container/_templatePage.scss
--- a/public/backup/assets/css/index.css
+++ b/public/backup/assets/css/index.css
--- a/public/backup/assets/css/index.css.map
+++ b/public/backup/assets/css/index.css.map
--- a/public/backup/assets/css/index.scss
+++ b/public/backup/assets/css/index.scss
--- a/public/backup/assets/css/module/_button.scss
+++ b/public/backup/assets/css/module/_button.scss
--- a/public/backup/assets/css/module/_keyframe.scss
+++ b/public/backup/assets/css/module/_keyframe.scss
--- a/public/backup/assets/css/module/_loader.scss
+++ b/public/backup/assets/css/module/_loader.scss
--- a/public/backup/assets/css/module/_typography.scss
+++ b/public/backup/assets/css/module/_typography.scss
--- a/public/backup/assets/css/module/_util.scss
+++ b/public/backup/assets/css/module/_util.scss
--- a/public/backup/assets/images/bg.png
+++ b/public/backup/assets/images/bg.png
--- a/public/backup/assets/images/bg2.png
+++ b/public/backup/assets/images/bg2.png
--- a/public/backup/assets/images/bg333.jpg
+++ b/public/backup/assets/images/bg333.jpg
--- a/public/backup/assets/images/btn-back.png
+++ b/public/backup/assets/images/btn-back.png
--- a/public/backup/assets/images/btn-next.png
+++ b/public/backup/assets/images/btn-next.png
--- a/public/backup/assets/images/btn-retake.png
+++ b/public/backup/assets/images/btn-retake.png
--- a/public/backup/assets/images/demo/demo-A.png
+++ b/public/backup/assets/images/demo/demo-A.png
--- a/public/backup/assets/images/demo/demo-B.png
+++ b/public/backup/assets/images/demo/demo-B.png
--- a/public/backup/assets/images/demo/template-A.jpg
+++ b/public/backup/assets/images/demo/template-A.jpg
--- a/public/backup/assets/images/demo/template-B.jpg
+++ b/public/backup/assets/images/demo/template-B.jpg
--- a/public/backup/assets/images/icon-camera.png
+++ b/public/backup/assets/images/icon-camera.png
--- a/public/backup/assets/images/icon-flip-camera.png
+++ b/public/backup/assets/images/icon-flip-camera.png
--- a/public/backup/assets/images/icon-insert-photo.png
+++ b/public/backup/assets/images/icon-insert-photo.png
--- a/public/backup/assets/images/masker.png
+++ b/public/backup/assets/images/masker.png
--- a/public/backup/assets/images/masker__.png
+++ b/public/backup/assets/images/masker__.png
--- a/public/backup/assets/images/merge-title.png
+++ b/public/backup/assets/images/merge-title.png
--- a/public/backup/assets/images/share-title.png
+++ b/public/backup/assets/images/share-title.png
--- a/public/backup/assets/images/share/albeeshare_fb.png
+++ b/public/backup/assets/images/share/albeeshare_fb.png
--- a/public/backup/assets/images/share/bettyshare_fb.png
+++ b/public/backup/assets/images/share/bettyshare_fb.png
--- a/public/backup/assets/images/share/chefchouchoushare_fb.png
+++ b/public/backup/assets/images/share/chefchouchoushare_fb.png
--- a/public/backup/assets/images/share/commute_changshare_fb.png
+++ b/public/backup/assets/images/share/commute_changshare_fb.png
--- a/public/backup/assets/images/share/commute_heshare_fb.png
+++ b/public/backup/assets/images/share/commute_heshare_fb.png
--- a/public/backup/assets/images/share/commute_lishare_fb.png
+++ b/public/backup/assets/images/share/commute_lishare_fb.png
--- a/public/backup/assets/images/share/cookingdairyshare_fb.png
+++ b/public/backup/assets/images/share/cookingdairyshare_fb.png
--- a/public/backup/assets/images/share/drangadrangshare_fb.png
+++ b/public/backup/assets/images/share/drangadrangshare_fb.png
--- a/public/backup/assets/images/share/haoshare_fb.png
+++ b/public/backup/assets/images/share/haoshare_fb.png
--- a/public/backup/assets/images/share/kushare_fb.png
+++ b/public/backup/assets/images/share/kushare_fb.png
--- a/public/backup/assets/images/share/ralfshare_fb.png
+++ b/public/backup/assets/images/share/ralfshare_fb.png
--- a/public/backup/assets/images/share/yangshare_fb.png
+++ b/public/backup/assets/images/share/yangshare_fb.png
--- a/public/backup/assets/images/table.png
+++ b/public/backup/assets/images/table.png
--- a/public/backup/assets/images/template_bg.jpg
+++ b/public/backup/assets/images/template_bg.jpg
--- a/public/backup/assets/images/tollbar-bg.png
+++ b/public/backup/assets/images/tollbar-bg.png
--- a/public/backup/assets/js/face-api/commons.js
+++ b/public/backup/assets/js/face-api/commons.js
--- a/public/backup/assets/js/face-api/face-api.js
+++ b/public/backup/assets/js/face-api/face-api.js
--- a/public/backup/assets/js/face-api/faceDetectionControls.js
+++ b/public/backup/assets/js/face-api/faceDetectionControls.js
--- a/public/backup/assets/js/faceFusionAPI.js
+++ b/public/backup/assets/js/faceFusionAPI.js
--- a/public/backup/assets/js/index.js
+++ b/public/backup/assets/js/index.js
--- a/public/backup/assets/js/loader.js
+++ b/public/backup/assets/js/loader.js
--- a/public/backup/assets/js/pageMerge.js
+++ b/public/backup/assets/js/pageMerge.js
--- a/public/backup/assets/js/pagePhotograph.js
+++ b/public/backup/assets/js/pagePhotograph.js
--- a/public/backup/assets/js/pageShare.js
+++ b/public/backup/assets/js/pageShare.js
--- a/public/backup/assets/js/pageTemplate.js
+++ b/public/backup/assets/js/pageTemplate.js
--- a/public/backup/assets/js/util.js
+++ b/public/backup/assets/js/util.js
--- a/public/backup/assets/js/webcam.js
+++ b/public/backup/assets/js/webcam.js
--- a/public/backup/assets/libs/babel.min.js
+++ b/public/backup/assets/libs/babel.min.js
--- a/public/backup/assets/libs/bootstrap-4.0.0/css/bootstrap-flex.css
+++ b/public/backup/assets/libs/bootstrap-4.0.0/css/bootstrap-flex.css
--- a/public/backup/assets/libs/bootstrap-4.0.0/css/bootstrap-flex.css.map
+++ b/public/backup/assets/libs/bootstrap-4.0.0/css/bootstrap-flex.css.map
--- a/public/backup/assets/libs/bootstrap-4.0.0/css/bootstrap-flex.min.css
+++ b/public/backup/assets/libs/bootstrap-4.0.0/css/bootstrap-flex.min.css
--- a/public/backup/assets/libs/bootstrap-4.0.0/css/bootstrap-flex.min.css.map
+++ b/public/backup/assets/libs/bootstrap-4.0.0/css/bootstrap-flex.min.css.map
--- a/public/backup/assets/libs/bootstrap-4.0.0/css/bootstrap-flex.min.min.css
+++ b/public/backup/assets/libs/bootstrap-4.0.0/css/bootstrap-flex.min.min.css
--- a/public/backup/assets/libs/bootstrap-4.0.0/css/bootstrap-grid.css
+++ b/public/backup/assets/libs/bootstrap-4.0.0/css/bootstrap-grid.css
--- a/public/backup/assets/libs/bootstrap-4.0.0/css/bootstrap-grid.css.map
+++ b/public/backup/assets/libs/bootstrap-4.0.0/css/bootstrap-grid.css.map
--- a/public/backup/assets/libs/bootstrap-4.0.0/css/bootstrap-grid.min.css
+++ b/public/backup/assets/libs/bootstrap-4.0.0/css/bootstrap-grid.min.css
--- a/public/backup/assets/libs/bootstrap-4.0.0/css/bootstrap-grid.min.css.map
+++ b/public/backup/assets/libs/bootstrap-4.0.0/css/bootstrap-grid.min.css.map
--- a/public/backup/assets/libs/bootstrap-4.0.0/css/bootstrap-grid.min.min.css
+++ b/public/backup/assets/libs/bootstrap-4.0.0/css/bootstrap-grid.min.min.css
--- a/public/backup/assets/libs/bootstrap-4.0.0/css/bootstrap-reboot.css
+++ b/public/backup/assets/libs/bootstrap-4.0.0/css/bootstrap-reboot.css
--- a/public/backup/assets/libs/bootstrap-4.0.0/css/bootstrap-reboot.css.map
+++ b/public/backup/assets/libs/bootstrap-4.0.0/css/bootstrap-reboot.css.map
--- a/public/backup/assets/libs/bootstrap-4.0.0/css/bootstrap-reboot.min.css
+++ b/public/backup/assets/libs/bootstrap-4.0.0/css/bootstrap-reboot.min.css
--- a/public/backup/assets/libs/bootstrap-4.0.0/css/bootstrap-reboot.min.css.map
+++ b/public/backup/assets/libs/bootstrap-4.0.0/css/bootstrap-reboot.min.css.map
--- a/public/backup/assets/libs/bootstrap-4.0.0/css/bootstrap-reboot.min.min.css
+++ b/public/backup/assets/libs/bootstrap-4.0.0/css/bootstrap-reboot.min.min.css
--- a/public/backup/assets/libs/bootstrap-4.0.0/css/bootstrap.css
+++ b/public/backup/assets/libs/bootstrap-4.0.0/css/bootstrap.css
--- a/public/backup/assets/libs/bootstrap-4.0.0/css/bootstrap.css.map
+++ b/public/backup/assets/libs/bootstrap-4.0.0/css/bootstrap.css.map
--- a/public/backup/assets/libs/bootstrap-4.0.0/css/bootstrap.min.css
+++ b/public/backup/assets/libs/bootstrap-4.0.0/css/bootstrap.min.css
--- a/public/backup/assets/libs/bootstrap-4.0.0/css/bootstrap.min.css.map
+++ b/public/backup/assets/libs/bootstrap-4.0.0/css/bootstrap.min.css.map
--- a/public/backup/assets/libs/bootstrap-4.0.0/css/bootstrap.min.min.css
+++ b/public/backup/assets/libs/bootstrap-4.0.0/css/bootstrap.min.min.css