From 2471d55e7fe06bbbd4af67db9e307b2a7e5d5ca2 Mon Sep 17 00:00:00 2001 From: Oliver Klee Date: Wed, 14 Oct 2015 19:22:59 +0200 Subject: [PATCH] [TASK] Prepare for the 1.0.0 release --- CHANGELOG.md | 5 +---- Classes/Emogrifier.php | 3 ++- composer.json | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 18e258d4..fcad58b9 100644 --- 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 index df0e9b56..ca821723 100644 --- 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 * @author Roman Ožana */ class Emogrifier diff --git a/composer.json b/composer.json index 7ac058fa..69e8ff47 100644 --- a/composer.json +++ b/composer.json @@ -40,7 +40,7 @@ }, "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-master": "1.1.x-dev" } } }