1
0
mirror of https://github.com/BoostIo/Boostnote synced 2025-12-13 01:36:22 +00:00

Merge remote-tracking branch 'origin/master' into feature/toc

Fix conflicts
This commit is contained in:
hikerpig
2019-10-10 18:23:39 +08:00
78 changed files with 4954 additions and 3639 deletions

View File

@@ -1,7 +1,7 @@
{
"name": "boost",
"productName": "Boostnote",
"version": "0.12.1-1",
"version": "0.12.1",
"main": "index.js",
"description": "Boostnote",
"license": "GPL-3.0",
@@ -99,6 +99,7 @@
"mousetrap": "^1.6.2",
"mousetrap-global-bind": "^1.1.0",
"node-ipc": "^8.1.0",
"prettier": "^1.18.2",
"prop-types": "^15.7.2",
"query-string": "^6.5.0",
"raphael": "^2.2.7",