mirror of
https://github.com/kuaifan/dootask.git
synced 2025-12-11 10:33:54 +00:00
# Conflicts: # electron/package.json # package.json # public/css/app.css # public/js/app.js # public/js/build/189.js.LICENSE.txt # public/js/build/206.js # public/js/build/400.js.LICENSE.txt # public/js/build/486.js # public/js/build/496.js.LICENSE.txt # public/js/build/528.js # public/js/build/535.js # public/js/build/535.js.LICENSE.txt # public/js/build/578.js # public/js/build/78.js.LICENSE.txt # public/js/build/817.js # public/js/build/856.js # public/js/build/862.js # public/js/build/889.js # public/js/build/91.js.LICENSE.txt # public/js/build/954.js # public/js/build/956.js # resources/assets/js/pages/manage/components/TaskDetail.vue # resources/assets/js/pages/manage/dashboard.vue # resources/assets/sass/pages/common.scss # resources/assets/sass/pages/page-dashboard.scss