Merge remote-tracking branch 'upstream/master' into HEAD · staheand/PHPMailer@e6787f4 · GitHub

This repository has been archived by the owner on Sep 29, 2021. It is now read-only.

Commit

Merge remote-tracking branch 'upstream/master' into HEAD

Browse files

Conflicts:
	class.phpmailer.php

Loading branch information

Synchro committed Jun 4, 2014

2 parents 204ebb5 + d4cae8d commit e6787f4