]> git.agnieray.net Git - galette.git/commit - galette/lib/Galette/Core/GaletteMail.php
Projects / galette.git / commit
summary | shortlog | log | commit | commitdiff | tree
(merge: 8f31851 882a051)
Merge branch 'hotfix/0.7.1.4' into develop
authorJohan Cwiklinski <johan@x-tnd.be>
Sun, 7 Oct 2012 16:38:50 +0000 (18:38 +0200)
committerJohan Cwiklinski <johan@x-tnd.be>
Sun, 7 Oct 2012 16:38:50 +0000 (18:38 +0200)
commite18fe98d47a8194dfe5308293a7e9e3bf35802e1
tree93cf7d5776cf9542755328e279483dac32bf6d5atree | snapshot
parent8f31851766e459f40631fac86f26f75351d985f3commit | diff
parent882a051eebc1f4bd4f326399dbf78335fe00a443commit | diff
Merge branch 'hotfix/0.7.1.4' into develop

Conflicts:
galette/includes/galette.inc.php
Galette membership management web application towards non profit (personal repository) | https://galette.eu