Merged master into rework

This commit is contained in:
squidfunk 2017-01-02 23:22:16 +01:00
commit c6946350a9
2 changed files with 7 additions and 7 deletions

View File

@ -62,5 +62,5 @@ push your branch to GitHub and send a PR to `mkdocs-material:master`. If we
suggest changes, make the required updates, rebase your branch and push
the changes to your GitHub repository, which will automatiaclly update your PR.
Afer your PR is merged, you can safely delete your branch and pull the changes
After your PR is merged, you can safely delete your branch and pull the changes
from the main (upstream) repository.

View File

@ -42,7 +42,7 @@
"babel-root-import": "^4.1.3",
"chai": "^3.5.0",
"core-js": "^2.4.1",
"css-mqpacker": "^4.0.0",
"css-mqpacker": "^5.0.1",
"custom-event-polyfill": "^0.3.0",
"del": "^2.2.0",
"eslint": "^3.6.1",
@ -53,21 +53,21 @@
"gulp-changed": "^1.3.2",
"gulp-concat": "^2.6.0",
"gulp-cssnano": "^2.1.1",
"gulp-htmlmin": "^1.3.0",
"gulp-htmlmin": "^3.0.0",
"gulp-if": "^2.0.0",
"gulp-ignore": "^2.0.1",
"gulp-modernizr": "0.0.0",
"gulp-plumber": "^1.1.0",
"gulp-postcss": "^6.1.0",
"gulp-remove-empty-lines": "0.0.2",
"gulp-remove-empty-lines": "0.0.8",
"gulp-replace": "^0.5.4",
"gulp-rev": "^7.0.0",
"gulp-rev-replace": "^0.4.3",
"gulp-sass": "^2.2.0",
"gulp-sass": "^3.0.0",
"gulp-sourcemaps": "^1.6.0",
"gulp-stylelint": "^3.7.0",
"gulp-svgmin": "^1.2.2",
"gulp-uglify": "^1.5.2",
"gulp-uglify": "^2.0.0",
"gulp-util": "^3.0.7",
"js-cookie": "^2.1.3",
"karma": "^1.3.0",
@ -94,7 +94,7 @@
"webpack": "^1.13.1",
"webpack-stream": "^3.2.0",
"whatwg-fetch": "^1.0.0",
"yargs": "^3.32.0"
"yargs": "^6.6.0"
},
"engines": {
"node": ">= 4.5.0"