]> git.agnieray.net Git - galette.git/commit - galette/lib/Galette/Core/GaletteMail.php
Merge branch 'hotfix/0.7.2.7' into develop
authorJohan Cwiklinski <johan@x-tnd.be>
Fri, 14 Dec 2012 21:22:14 +0000 (22:22 +0100)
committerJohan Cwiklinski <johan@x-tnd.be>
Fri, 14 Dec 2012 21:22:14 +0000 (22:22 +0100)
commit2f7fafba7cc4d69d5a1af6cf13f22aad2aa81c12
tree90edac05cd3b622640d47dc3af185b22c28462a1
parentc754dc3236122272bd2ba27e04fe10e6822626c6
parentf13ebb4f6ba1f58739b4e9b2fc673a5a5ea21555
Merge branch 'hotfix/0.7.2.7' into develop

Conflicts:
galette/includes/galette.inc.php
galette/ajouter_adherent.php
galette/includes/galette.inc.php
galette/lib/Galette/Core/Login.php
galette/lostpasswd.php
galette/self_adherent.php