diff --git a/CHANGELOG.md b/CHANGELOG.md index c39f7b9c9..cbc890c3e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Change Log +All notable changes to this project will be documented in this file. + +The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) +and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). + +## v4.1.17-alpha +- Lock `gulp-uf-bundle-assets` at v2.28.0 until Silic0nS0ldier/gulp-uf-bundle-assets#5 is resolved (see #859) + ## v4.1.16-alpha - Fix for `merge` bundling rule (#660) - Fix for undefined variable exception under strict mode in `ufAlerts` (#809) diff --git a/app/defines.php b/app/defines.php index b93f048d7..d1294240f 100755 --- a/app/defines.php +++ b/app/defines.php @@ -3,7 +3,7 @@ namespace UserFrosting; // Some standard defines -define('UserFrosting\VERSION', '4.1.16-alpha'); +define('UserFrosting\VERSION', '4.1.17-alpha'); define('UserFrosting\DS', '/'); define('UserFrosting\PHP_MIN_VERSION', '5.6'); define('UserFrosting\DEBUG_CONFIG', false); diff --git a/build/package.json b/build/package.json index c00a2090f..d9dc74a6c 100755 --- a/build/package.json +++ b/build/package.json @@ -11,7 +11,7 @@ "license": "MIT", "devDependencies": { "gulp": "^3.9.1", - "gulp-uf-bundle-assets": "^2.27.2", + "gulp-uf-bundle-assets": "2.28.0", "gulp-load-plugins": "^1.4.0", "merge-array-object": "^1.0.3", "recursive-copy": "^2.0.5",