life
|
f31f10483d
|
Merge branch 'electron'
Conflicts:
.gitignore
README.md
src/data/version
src/node_modules/note.js
src/node_modules/notebook.js
src/node_modules/web.js
src/note.html
src/package.json
src/package_mac.json
src/public/config-default.js
src/public/js/app/native.js
src/public/js/app/note.js
src/public/js/app/page.js
src/public/js/common.js
src/public/themes/basic.less
src/public/themes/default.css
src/public/themes/default.less
src/public/themes/windows.css
src/public/themes/windows.less
src/public/tinymce/plugins/leanote_code/plugin.js
src/public/tinymce/plugins/leanote_code/plugin.min.js
|
2015-09-24 13:19:13 +08:00 |
|