leanote/desktop-app
1
0
Fork 0
mirror of https://github.com/leanote/desktop-app.git synced 2025-10-14 15:11:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature-export-from-evernote' into pre-release

Browse Source 
Conflicts:
	public/langs/zh-cn.js
	public/langs/zh-hk.js
This commit is contained in:
life
2015-10-26 23:17:11 +08:00
parent bd59846b0a 58988738df
commit 11bb0d6604
37 changed files with 5317 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
data/version
View File

@@ -1 +1,5 @@
{"version":"0.8","updatedTime":"2015-10-24T07:11:51.505Z"}
<<<<<<< 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