aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/package.json
diff options
context:
space:
mode:
authorChocobozzz <florian.bigard@gmail.com>2017-12-11 11:06:32 +0100
committerChocobozzz <florian.bigard@gmail.com>2017-12-11 11:06:32 +0100
commitfada8d75550dc7365f7e18ee1569b9406251d660 (patch)
treedb9dc01c18693824f83fce5020f4c1f3ae7c0865 /client/package.json
parent492fd28167f770d79a430fc57451b5a9e075d8e7 (diff)
parentc2830fa8f84f61462098bf36add824f89436dfa9 (diff)
downloadPeerTube-fada8d75550dc7365f7e18ee1569b9406251d660.tar.gz
PeerTube-fada8d75550dc7365f7e18ee1569b9406251d660.tar.zst
PeerTube-fada8d75550dc7365f7e18ee1569b9406251d660.zip
Merge branch 'feature/design' into develop
Diffstat (limited to 'client/package.json')
-rw-r--r--client/package.json6
1 files changed, 4 insertions, 2 deletions
diff --git a/client/package.json b/client/package.json
index 39b3185cc..45f555f29 100644
--- a/client/package.json
+++ b/client/package.json
@@ -43,7 +43,6 @@
43 "@types/webpack": "^3.0.0", 43 "@types/webpack": "^3.0.0",
44 "@types/webtorrent": "^0.98.4", 44 "@types/webtorrent": "^0.98.4",
45 "add-asset-html-webpack-plugin": "^2.0.1", 45 "add-asset-html-webpack-plugin": "^2.0.1",
46 "angular-pipes": "^6.0.0",
47 "angular2-notifications": "^0.7.7", 46 "angular2-notifications": "^0.7.7",
48 "angular2-template-loader": "^0.6.0", 47 "angular2-template-loader": "^0.6.0",
49 "assets-webpack-plugin": "^3.4.0", 48 "assets-webpack-plugin": "^3.4.0",
@@ -70,8 +69,10 @@
70 "markdown-it": "^8.4.0", 69 "markdown-it": "^8.4.0",
71 "ng-router-loader": "^2.0.0", 70 "ng-router-loader": "^2.0.0",
72 "ngc-webpack": "3.2.2", 71 "ngc-webpack": "3.2.2",
73 "ngx-bootstrap": "1.9.3", 72 "ngx-bootstrap": "2.0.0-beta.9",
74 "ngx-chips": "1.5.3", 73 "ngx-chips": "1.5.3",
74 "ngx-infinite-scroll": "^0.7.0",
75 "ngx-pipes": "^2.0.5",
75 "node-sass": "^4.1.1", 76 "node-sass": "^4.1.1",
76 "normalize.css": "^7.0.0", 77 "normalize.css": "^7.0.0",
77 "optimize-js-plugin": "0.0.4", 78 "optimize-js-plugin": "0.0.4",
@@ -86,6 +87,7 @@
86 "sass-resources-loader": "^1.2.1", 87 "sass-resources-loader": "^1.2.1",
87 "script-ext-html-webpack-plugin": "^1.3.2", 88 "script-ext-html-webpack-plugin": "^1.3.2",
88 "source-map-loader": "^0.2.1", 89 "source-map-loader": "^0.2.1",
90 "source-sans-pro": "^2.0.10",
89 "standard": "^10.0.0", 91 "standard": "^10.0.0",
90 "string-replace-loader": "^1.0.3", 92 "string-replace-loader": "^1.0.3",
91 "style-loader": "^0.19.0", 93 "style-loader": "^0.19.0",