leanote/desktop-app
1
0
Fork 0
mirror of https://github.com/leanote/desktop-app.git synced 2026-01-13 07:03:04 +08:00
Code Issues Packages Projects Releases Wiki Activity
Files
11bb0d6604077e05b3e3e8654f5da499e1a4a289
desktop-app/data/version
life 11bb0d6604 Merge branch 'feature-export-from-evernote' into pre-release 
Conflicts:
	public/langs/zh-cn.js
	public/langs/zh-hk.js
2015-10-26 23:17:11 +08:00

6 lines
176 B
Plaintext
Raw Blame History

<<<<<<< HEAD
{"version":"0.8","updatedTime":"2015-10-24T07:11:51.505Z"}
=======
{"version":"0.9","updatedTime":"2015-10-16T07:11:51.505Z"}
>>>>>>> feature-export-from-evernote
Reference in New Issue View Git Blame Copy Permalink