Merge pull request #1015 from payrollhero/update-changelog

Update Changelog for v2.6.0 release
mileszs · Apr 20, 2022 · e589a38 · e589a38
2 parents 077f0b3 + d9d6765
commit e589a38
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,9 +4,13 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [master branch] - Unreleased
 ### Breaking Changes
+
+## [2.6.0]
 ### New Features
+- [Support Propshaft in find_asset helper](https://github.com/mileszs/wicked_pdf/pull/1010)
 ### Fixes
-- [Update Changelog.](https://github.com/mileszs/wicked_pdf/pull/1013)
+- [Update Changelog with changes from 2.1.0](https://github.com/mileszs/wicked_pdf/pull/1013)
+- [Fix CI build for Rails 7.](https://github.com/mileszs/wicked_pdf/pull/1014)
 
 ## [2.5.4] December 20th 2021 769f9df487f3c1e31dc91431666baa78d2aa24fb
 ### New Features

diff --git a/lib/wicked_pdf/version.rb b/lib/wicked_pdf/version.rb
@@ -1,3 +1,3 @@
 class WickedPdf
-  VERSION = '2.1.0'.freeze
+  VERSION = '2.6.0'.freeze
 end