diff --git a/CHANGELOG.md b/CHANGELOG.md index 42bfda7f..d90e4cd8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,10 @@ This project adheres to [Semantic Versioning](https://semver.org/). - Escape hyphens in regular expressions ([#599](https://github.com/MyIntervals/emogrifier/pull/599)) +### Removed +- Drop the `@version` PHPDoc annotations + ([#644](https://github.com/MyIntervals/emogrifier/pull/644)) + ## 1.2.1 ### Added diff --git a/Classes/Emogrifier.php b/Classes/Emogrifier.php index 46c42544..a69da6d9 100644 --- a/Classes/Emogrifier.php +++ b/Classes/Emogrifier.php @@ -6,8 +6,6 @@ * * For more information, please see the README.md file. * - * @version 1.2.0 - * * @author Cameron Brooks * @author Jaime Prado * @author Oliver Klee diff --git a/composer.json b/composer.json index 003c6a18..97621cd5 100644 --- a/composer.json +++ b/composer.json @@ -50,7 +50,7 @@ }, "extra": { "branch-alias": { - "dev-master": "1.3.x-dev" + "dev-master": "2.1.x-dev" } } }