Merge branch 'master' into rework

Conflicts:
	package.json
This commit is contained in:
squidfunk 2017-01-12 20:17:33 +01:00
commit e5831239e2

View File

@ -64,7 +64,7 @@
"gulp-rev": "^7.0.0",
"gulp-rev-replace": "^0.4.3",
"gulp-sass": "^3.0.0",
"gulp-sourcemaps": "^1.6.0",
"gulp-sourcemaps": "^2.2.2",
"gulp-stylelint": "^3.7.0",
"gulp-svgmin": "^1.2.2",
"gulp-uglify": "^2.0.0",