5.2.12 release

Synchro · Sep 2, 2015 · 5dd7541 · 5dd7541
1 parent cbd7fa9
commit 5dd7541
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -50,11 +50,7 @@ or
 composer require phpmailer/phpmailer
 ```
 
-or use the command below:
-
-```sh
-composer require phpmailer/phpmailer
-```
+If you want to use the Gmail XOAUTH2 authentication class, you will also need to add a dependency on the `league/oauth2-client` package.
 
 Alternatively, copy the contents of the PHPMailer folder into somewhere that's in your PHP `include_path` setting. If you don't speak git or just want a tarball, click the 'zip' button at the top of the page in GitHub.
 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-5.2.11
+5.2.12
diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,9 @@
 # ChangeLog
 
+## Version 5.2.12 (Sep 1st 2015)
+* Fix incorrect composer package dependencies
+* Skip existing embedded image `cid`s in `msgHTML`
+
 ## Version 5.2.11 (Aug 31st 2015)
 * Don't switch to quoted-printable for long lines if already using base64
 * Fixed Travis-CI config when run on PHP 7

diff --git a/class.phpmailer.php b/class.phpmailer.php
@@ -31,7 +31,7 @@ class PHPMailer
  * The PHPMailer Version number.
  * @type string
  */
- public $Version = '5.2.11';
+ public $Version = '5.2.12';
 
  /**
  * Email priority.

diff --git a/class.pop3.php b/class.pop3.php
@@ -34,7 +34,7 @@ class POP3
  * @type string
  * @access public
  */
- public $Version = '5.2.11';
+ public $Version = '5.2.12';
 
  /**
  * Default POP3 port number.

diff --git a/class.smtp.php b/class.smtp.php
@@ -30,7 +30,7 @@ class SMTP
  * The PHPMailer SMTP version number.
  * @type string
  */
- const VERSION = '5.2.11';
+ const VERSION = '5.2.12';
 
  /**
  * SMTP line break constant.
@@ -81,7 +81,7 @@ class SMTP
  * @deprecated Use the `VERSION` constant instead
  * @see SMTP::VERSION
  */
- public $Version = '5.2.11';
+ public $Version = '5.2.12';
 
  /**
  * SMTP server port number.