aboutsummaryrefslogtreecommitdiffhomepage
path: root/package.json
diff options
context:
space:
mode:
authorJeremy Benoist <jeremy.benoist@gmail.com>2018-07-03 13:55:25 +0200
committerJeremy Benoist <jeremy.benoist@gmail.com>2018-07-03 13:55:25 +0200
commit44043ebe82a22470e2514d05efac324035ee809a (patch)
tree5ea40b62ce665a8bab6a3e280a47f3be11838e27 /package.json
parent11f15430ffc67e30f084cffc8e909ace87ce19e1 (diff)
parente586d65b64089fc1cc230a18c470aae3f45f91a6 (diff)
downloadwallabag-44043ebe82a22470e2514d05efac324035ee809a.tar.gz
wallabag-44043ebe82a22470e2514d05efac324035ee809a.tar.zst
wallabag-44043ebe82a22470e2514d05efac324035ee809a.zip
Merge remote-tracking branch 'origin/master' into 2.4
Diffstat (limited to 'package.json')
-rw-r--r--package.json1
1 files changed, 1 insertions, 0 deletions
diff --git a/package.json b/package.json
index e6659bd3..8d856bbb 100644
--- a/package.json
+++ b/package.json
@@ -65,6 +65,7 @@
65 "dependencies": { 65 "dependencies": {
66 "annotator": "git://github.com/wallabag/annotator.git#0f076c7d371ed25eb0793346f46982d90f2c4c85", 66 "annotator": "git://github.com/wallabag/annotator.git#0f076c7d371ed25eb0793346f46982d90f2c4c85",
67 "hammerjs": "^2.0.8", 67 "hammerjs": "^2.0.8",
68 "highlight.js": "^9.12.0",
68 "icomoon-free-npm": "^0.0.0", 69 "icomoon-free-npm": "^0.0.0",
69 "jquery": "^2.1.4", 70 "jquery": "^2.1.4",
70 "jquery.cookie": "^1.4.1", 71 "jquery.cookie": "^1.4.1",