Merge pull request #266 from jjriv/task/release-1.0.0

[TASK] Prepare for the 1.0.0 release
MyIntervals · Oct 14, 2015 · 1160bcb · 1160bcb
2 parents 0951159 + 2471d55
commit 1160bcb
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,7 +7,7 @@ Emogrifier is in a pre-1.0 state. This means that its APIs and behavior are
 subject to breaking changes without deprecation notices.
 
 
-## [Unreleased][]
+## [1.0.0][] (2015-10-15)
 
 ### Added
 - Add branch alias ([#231](https://github.com/jjriv/emogrifier/pull/231))
@@ -90,6 +90,3 @@ subject to breaking changes without deprecation notices.
   ([#26](https://github.com/jjriv/emogrifier/pull/26))
 - Make removal of invisible nodes operate in a case-insensitive manner
 - Fix a bug that was overwriting existing inline styles from the original HTML
-
-
-### Security
diff --git a/Classes/Emogrifier.php b/Classes/Emogrifier.php
@@ -6,10 +6,11 @@
  *
  * For more information, please see the README.md file.
  *
- * @version 0.1.1
+ * @version 1.0.0
  *
  * @author Cameron Brooks
  * @author Jaime Prado
+ * @author Oliver Klee <typo3-coding@oliverklee.de>
  * @author Roman Ožana <ozana@omdesign.cz>
  */
 class Emogrifier

diff --git a/composer.json b/composer.json
@@ -40,7 +40,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.0-dev"
+            "dev-master": "1.1.x-dev"
         }
     }
 }