prueba modificando una rama
Merge branch 'master' of https://github.com/juankymoral/PHPMailer