kuaifan f596749645 Merge branch 'master' of github.com:kuaifan/dootask into develop ...

# Conflicts:
#	electron/package.json
#	package.json
#	public/css/app.css
#	public/js/app.js
#	public/js/build/120.js
#	public/js/build/120.js.LICENSE.txt
#	public/js/build/146.js.LICENSE.txt
#	public/js/build/161.js
#	public/js/build/284.js
#	public/js/build/309.js
#	public/js/build/400.js
#	public/js/build/644.js
#	public/js/build/644.js.LICENSE.txt
#	public/js/build/79.js.LICENSE.txt
#	resources/assets/js/pages/manage/components/TaskAdd.vue

2022-01-26 09:35:16 +08:00

..

assets

Merge branch 'master' of github.com:kuaifan/dootask into develop

2022-01-26 09:35:16 +08:00

lang/en

no message

2021-05-30 23:22:12 +08:00

views

fix: 修复客户端旧版本更新任务出现已完成列表中有状态为“进行中”的情况

2022-01-13 11:48:33 +08:00