[TASK] Prepare the 1.2.2 release

- remove the outdated `@version` annotation - sync the master branch alias to the latest composer.json
MyIntervals · Dec 10, 2018 · fef6a4d · fef6a4d
1 parent 50e173d
commit fef6a4d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git 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
@@ -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 <typo3-coding@oliverklee.de>

diff --git 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"
  }
  }
 }