Files
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

<<<<<<< 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