Marcus Bointon 81062fa300 Merge remote-tracking branch 'remotes/origin/master' into 6.0 ... # Conflicts: # VERSION # src/PHPMailer.php # src/POP3.php # src/SMTP.php		2017-08-28 13:39:01 +02:00
..
issue_template.md	Merge remote-tracking branch 'remotes/origin/master' into 6.0	2017-08-28 13:39:01 +02:00
ISSUE_TEMPLATE.md	v5.2.25	2017-08-28 13:12:07 +02:00