diff options
author | Chocobozzz <me@florianbigard.com> | 2018-09-20 16:24:31 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-20 16:24:31 +0200 |
commit | 0491173a61aed66205c017e0d7e0503ea316c144 (patch) | |
tree | ce6621597505f9518cfdf0981977d097c63f9fad /package.json | |
parent | 8704acf49efc770d73bf07c10468ed8c74d28a83 (diff) | |
parent | 6247b2057b792cea155a1abd9788c363ae7d2cc2 (diff) | |
download | PeerTube-0491173a61aed66205c017e0d7e0503ea316c144.tar.gz PeerTube-0491173a61aed66205c017e0d7e0503ea316c144.tar.zst PeerTube-0491173a61aed66205c017e0d7e0503ea316c144.zip |
Merge branch 'develop' into cli-wrapper
Diffstat (limited to 'package.json')
-rw-r--r-- | package.json | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/package.json b/package.json index cc4f6be5c..d5cf95b83 100644 --- a/package.json +++ b/package.json | |||
@@ -73,7 +73,7 @@ | |||
73 | }, | 73 | }, |
74 | "lint-staged": { | 74 | "lint-staged": { |
75 | "*.scss": [ | 75 | "*.scss": [ |
76 | "sass-lint -c .sass-lint.yml", | 76 | "sass-lint -c client/.sass-lint.yml", |
77 | "git add" | 77 | "git add" |
78 | ] | 78 | ] |
79 | }, | 79 | }, |
@@ -116,6 +116,7 @@ | |||
116 | "jsonld-signatures": "https://github.com/Chocobozzz/jsonld-signatures#rsa2017", | 116 | "jsonld-signatures": "https://github.com/Chocobozzz/jsonld-signatures#rsa2017", |
117 | "lodash": "^4.17.10", | 117 | "lodash": "^4.17.10", |
118 | "magnet-uri": "^5.1.4", | 118 | "magnet-uri": "^5.1.4", |
119 | "memoizee": "^0.4.14", | ||
119 | "morgan": "^1.5.3", | 120 | "morgan": "^1.5.3", |
120 | "multer": "^1.1.0", | 121 | "multer": "^1.1.0", |
121 | "netrc-parser": "^3.1.6", | 122 | "netrc-parser": "^3.1.6", |
@@ -165,6 +166,7 @@ | |||
165 | "@types/lodash": "^4.14.64", | 166 | "@types/lodash": "^4.14.64", |
166 | "@types/magnet-uri": "^5.1.1", | 167 | "@types/magnet-uri": "^5.1.1", |
167 | "@types/maildev": "^0.0.1", | 168 | "@types/maildev": "^0.0.1", |
169 | "@types/memoizee": "^0.4.2", | ||
168 | "@types/mkdirp": "^0.5.1", | 170 | "@types/mkdirp": "^0.5.1", |
169 | "@types/mocha": "^5.0.0", | 171 | "@types/mocha": "^5.0.0", |
170 | "@types/morgan": "^1.7.32", | 172 | "@types/morgan": "^1.7.32", |