Merge pull request #86 from thephpleague/prepare-for-4.2.0

Prepare for 4.2.0 release
thephpleague · Feb 1, 2016 · 9a5becc · 9a5becc
2 parents 32626c3 + e40085c
commit 9a5becc
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,15 @@ Updates should follow the [Keep a CHANGELOG](http://keepachangelog.com/) princip
 
 ## [Unreleased][unreleased]
 
+## [4.2.0]
+
+### Added
+ - Added the ability to invoke HtmlConverter objects as functions (#85)
+
+### Fixed
+ - Fixed improper handling of nested list items (#19 and #84)
+ - Fixed preceeding or trailing spaces within emphasis tags (#83)
+
 ## [4.1.1]
 
 ### Fixed
@@ -127,7 +136,8 @@ not ideally set, so this releases fixes that. Moving forwards this should reduce
 ### Added
  - Initial release
 
-[unreleased]: https://github.com/thephpleague/html-to-markdown/compare/4.1.1...master
+[unreleased]: https://github.com/thephpleague/html-to-markdown/compare/4.2.0...master
+[4.2.0]: https://github.com/thephpleague/html-to-markdown/compare/4.1.1...4.2.0
 [4.1.1]: https://github.com/thephpleague/html-to-markdown/compare/4.1.0...4.1.1
 [4.1.0]: https://github.com/thephpleague/html-to-markdown/compare/4.0.1...4.1.0
 [4.0.1]: https://github.com/thephpleague/html-to-markdown/compare/4.0.0...4.0.1

diff --git a/composer.json b/composer.json
@@ -42,7 +42,7 @@
     "bin": ["bin/html-to-markdown"],
     "extra": {
         "branch-alias": {
-            "dev-master": "4.2-dev"
+            "dev-master": "4.3-dev"
         }
     }
 }