Commit Graph

5 Commits

Author SHA1 Message Date
Marcus Bointon 22e81749ae
Switch from PHP CS fixer to phpcs and apply PSR12 reformatting 2020-10-13 15:08:42 +02:00
Marcus Bointon 916d68cf17
Tweak PR template to be less potentially destructive 2017-10-10 09:10:40 +02:00
Filippo Tessarotto d5ef7a2b5e Create PULL_REQUEST_TEMPLATE.md (#1165) 2017-09-15 15:38:30 +02:00
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
Marcus Bointon 2baf20b016
v5.2.25 2017-08-28 13:12:07 +02:00