diff options
| author | Alexandr Kondrashov <[email protected]> | 2015-09-11 16:43:00 +0300 |
|---|---|---|
| committer | Alexandr Kondrashov <[email protected]> | 2015-09-11 16:43:00 +0300 |
| commit | c9725926b2f30bed4e37f57c20ef8ffeb2fd233b (patch) | |
| tree | 2964ad7556549dd3e0712bdfdbc5fc4ae7a9b45f /package.json | |
| parent | 353e0a49a97c24d89f6cdb95014419d4137dee6e (diff) | |
| parent | b811f8cf9628dbcbfe994f71588c5a0c921a092d (diff) | |
| download | bootstrap-c9725926b2f30bed4e37f57c20ef8ffeb2fd233b.tar.xz bootstrap-c9725926b2f30bed4e37f57c20ef8ffeb2fd233b.zip | |
Merge remote-tracking branch 'twbs/v4-dev' into patch-1
Conflicts:
scss/_custom-forms.scss
scss/_variables.scss
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 42 |
1 files changed, 19 insertions, 23 deletions
diff --git a/package.json b/package.json index eded9e2b4..aa18f874a 100644 --- a/package.json +++ b/package.json @@ -28,45 +28,41 @@ }, "license": "MIT", "devDependencies": { - "babel-eslint": "^4.0.10", + "babel-eslint": "^4.1.1", "btoa": "~1.1.2", - "glob": "~5.0.3", + "glob": "~5.0.14", "grunt": "~0.4.5", - "grunt-autoprefixer": "~2.2.0", - "grunt-babel": "^5.0.0", - "grunt-banner": "~0.3.1", - "grunt-build-control": "~0.2.0", + "grunt-autoprefixer": "~3.0.3", + "grunt-babel": "^5.0.1", + "grunt-build-control": "~0.5.0", "grunt-contrib-clean": "~0.6.0", "grunt-contrib-compress": "~0.13.0", "grunt-contrib-concat": "~0.5.1", - "grunt-contrib-connect": "~0.9.0", - "grunt-contrib-copy": "~0.8.0", - "grunt-contrib-csslint": "~0.4.0", - "grunt-contrib-cssmin": "~0.12.2", - "grunt-contrib-jade": "~0.14.1", - "grunt-contrib-jshint": "~0.11.0", - "grunt-contrib-qunit": "~0.5.2", - "grunt-contrib-sass": "^0.8.1", - "grunt-contrib-uglify": "~0.8.0", + "grunt-contrib-connect": "~0.11.2", + "grunt-contrib-copy": "~0.8.1", + "grunt-contrib-cssmin": "~0.13.0", + "grunt-contrib-qunit": "~0.7.0", + "grunt-contrib-sass": "^0.9.2", + "grunt-contrib-uglify": "~0.9.2", "grunt-contrib-watch": "~0.6.1", - "grunt-csscomb": "~3.0.0", + "grunt-csscomb": "~3.1.0", "grunt-eslint": "^17.1.0", "grunt-exec": "~0.4.6", - "grunt-html": "~4.0.1", + "grunt-html": "~5.0.0", "grunt-jekyll": "~0.4.2", "grunt-jscs": "~1.8.0", "grunt-line-remover": "0.0.2", - "grunt-postcss": "^0.3.0", + "grunt-postcss": "^0.6.0", "grunt-sass": "^1.0.0", - "grunt-saucelabs": "~8.6.0", - "grunt-scss-lint": "^0.3.4", + "grunt-saucelabs": "~8.6.1", + "grunt-scss-lint": "^0.3.8", "grunt-sed": "~0.1.1", "grunt-stamp": "^0.1.0", - "load-grunt-tasks": "~3.1.0", - "markdown-it": "^4.0.1", + "load-grunt-tasks": "~3.2.0", + "markdown-it": "^4.4.0", "mq4-hover-shim": "^0.2.0", "npm-shrinkwrap": "^200.1.0", - "time-grunt": "^1.1.0" + "time-grunt": "^1.2.1" }, "engines": { "node": ">=0.10.1" |