Skip to content

Commit

Permalink
Merge branch 'dev' of github.com:wireapp/wire-webapp into camelUtil
Browse files Browse the repository at this point in the history
* 'dev' of github.com:wireapp/wire-webapp:
  chore: Update @wireapp/core to version 2.0.83 (#2847)
  chore: Update enzyme-to-json to version 3.3.3 (#2851)
  chore: Update uglifyjs-webpack-plugin to version 1.2.4 (#2849)
  chore: Update css-loader to version 0.28.11 (#2850)
  chore: Update eslint to version 4.19.0 (#2848)
  chore: Update postcss-loader to version 2.1.2 (#2846)
  • Loading branch information
lipis committed Mar 19, 2018
2 parents 45d815b + 2084819 commit c10e878
Show file tree
Hide file tree
Showing 2 changed files with 156 additions and 123 deletions.
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"@bower_components/webrtc-adapter": "webrtc/adapter#6.1.4",
"@bower_components/wire-audio-files": "wireapp/wire-audio-files#1.1.1",
"@bower_components/wire-theme": "wireapp/wire-theme#1.0.6",
"@wireapp/core": "2.0.78",
"@wireapp/core": "2.0.83",
"@wireapp/react-ui-kit": "1.0.15",
"babel-plugin-react-intl": "2.4.0",
"babel-polyfill": "6.26.0",
Expand Down Expand Up @@ -70,13 +70,13 @@
"babel-plugin-transform-object-rest-spread": "6.26.0",
"babel-preset-env": "1.6.1",
"babel-preset-react": "6.24.1",
"css-loader": "0.28.10",
"css-loader": "0.28.11",
"cssnano": "3.10.0",
"concurrently": "3.5.1",
"enzyme": "3.3.0",
"enzyme-adapter-react-16": "1.1.1",
"enzyme-to-json": "3.3.1",
"eslint": "4.18.2",
"enzyme-to-json": "3.3.3",
"eslint": "4.19.0",
"eslint-config-prettier": "2.9.0",
"eslint-plugin-babel": "4.1.2",
"eslint-plugin-jsdoc": "3.5.0",
Expand Down Expand Up @@ -120,7 +120,7 @@
"node-sass": "4.8.1",
"postcss-cssnext": "3.1.0",
"postcss-import": "11.1.0",
"postcss-loader": "2.1.1",
"postcss-loader": "2.1.2",
"postcss-scss": "1.0.4",
"prettier": "1.11.1",
"raf": "3.4.0",
Expand All @@ -134,7 +134,7 @@
"sinon": "4.4.6",
"style-loader": "0.20.3",
"uglify-js": "3.3.15",
"uglifyjs-webpack-plugin": "1.2.3",
"uglifyjs-webpack-plugin": "1.2.4",
"webpack": "3.11.0",
"webpack-dev-server": "2.11.1"
},
Expand Down
Loading

0 comments on commit c10e878

Please sign in to comment.