Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into HEAD
Browse files Browse the repository at this point in the history 
Conflicts:
	class.phpmailer.php
  • Loading branch information
@Synchro
Synchro committed Jun 4, 2014
2 parents 204ebb5 + d4cae8d commit e6787f4
Showing 1 changed file with 83 additions and 71 deletions.

0 comments on commit e6787f4

Please sign in to comment.