Skip to content

Commit

Permalink
Merge branch 'master' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
Polyneue committed May 12, 2017
2 parents da8c4f8 + 703f70e commit 007eb6a
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 4 deletions.
13 changes: 10 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# 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/) and this project adheres to [Semantic Versioning](http://semver.org/).
> All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/).
## [1.1.5] - 2017-11-05
### Changed
* Changed to using airbnb standards
* Switched to Chalk over gutil module
* README updates

## [1.1.4] - 2017-15-04
### Added
Expand Down Expand Up @@ -37,9 +43,10 @@ All notable changes to this project will be documented in this file. The format
### Added
* Initial setup of README, Package, License and tests

[1.1.4]: https://github.com/Polyneue/gulp-asset-cache/compare/v1.1.3...HEAD
[1.1.5]: https://github.com/Polyneue/gulp-asset-cache/compare/v1.1.4...HEAD
[1.1.4]: https://github.com/Polyneue/gulp-asset-cache/compare/v1.1.3...v1.1.4
[1.1.3]: https://github.com/Polyneue/gulp-asset-cache/compare/v1.1.2...v1.1.3
[1.1.2]: https://github.com/Polyneue/gulp-asset-cache/compare/v1.1.1...v1.1.2
[1.1.1]: https://github.com/Polyneue/gulp-asset-cache/compare/v1.1.0...v1.1.1
[1.1.0]: https://github.com/Polyneue/gulp-asset-cache/compare/v1.0.1...v1.1.0
[1.0.1]: https://github.com/Polyneue/gulp-asset-cache/compare/v1.0.0...v1.0.1
[1.0.1]: https://github.com/Polyneue/gulp-asset-cache/compare/v1.0.0...v1.0.1
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "gulp-asset-cache",
"version": "1.1.4",
"version": "1.1.5",
"description": "A disk based caching task for gulp",
"main": "index.js",
"scripts": {
Expand Down

0 comments on commit 007eb6a

Please sign in to comment.