diff --git a/CHANGELOG.md b/CHANGELOG.md index 8db5f76..5182e4c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,11 +1,11 @@ # Changelog ### HEAD +* Update dependencies from bower and npm * Update Apache Server Configs to v2.11.0 * Rename Apple touch icon to `apple-touch-icon.png` and add
`` in `templates/header.html` ([h5bp/html5-boilerplate#1622](https://github.com/h5bp/html5-boilerplate/pull/1622)) -* Update `bower` and `npm` dependencies * Removed obsolete sourcemapping option * Update `apple-touch-icon-precomposed.png` ([h5bp/html5-boilerplate#1599](https://github.com/h5bp/html5-boilerplate/pull/1599)) diff --git a/bower.json b/bower.json index 3015e1e..83afc62 100644 --- a/bower.json +++ b/bower.json @@ -5,9 +5,9 @@ "ignore": [], "dependencies": { "jquery": "1.11.1", - "normalize-scss": "3.0.1", + "normalize-scss": "3.0.2", "modernizr": "2.8.3", "requirejs": "2.1.15", - "sass-mixins": "0.10.0" + "sass-mixins": "0.11.0" } } diff --git a/package.json b/package.json index 168b525..18d32b9 100644 --- a/package.json +++ b/package.json @@ -21,13 +21,13 @@ "dependencies": {}, "devDependencies": { "bower": "1.3.12", - "glob": "4.0.6", + "glob": "4.2.0", "grunt": "0.4.5", "grunt-contrib-clean": "0.6.0", "grunt-contrib-concat": "0.5.0", - "grunt-contrib-connect": "0.8.0", - "grunt-contrib-copy": "0.6.0", - "grunt-contrib-imagemin": "0.8.1", + "grunt-contrib-connect": "0.9.0", + "grunt-contrib-copy": "0.7.0", + "grunt-contrib-imagemin": "0.9.2", "grunt-contrib-jshint": "0.10.0", "grunt-contrib-requirejs": "0.4.4", "grunt-contrib-sass": "0.8.1", @@ -35,13 +35,13 @@ "grunt-karma": "0.9.0", "grunt-modernizr": "0.6.0", "grunt-replace": "0.8.0", - "jit-grunt": "^0.8.0", - "karma": "0.12.24", + "jit-grunt": "^0.9.0", + "karma": "0.12.25", "karma-chrome-launcher": "0.1.5", "karma-coverage": "0.2.6", "karma-firefox-launcher": "0.1.3", "karma-html2js-preprocessor": "0.1.0", - "karma-jasmine": "0.1.5", + "karma-jasmine": "0.3.0", "karma-phantomjs-launcher": "0.1.4", "karma-requirejs": "0.2.2", "karma-safari-launcher": "0.1.1",