]> git.agnieray.net Git - galette.git/commit - galette/lib/Galette/Core/GaletteMail.php
Merge branch 'hotfix/0.7.2.4' into develop
authorJohan Cwiklinski <johan@x-tnd.be>
Wed, 5 Dec 2012 09:36:08 +0000 (10:36 +0100)
committerJohan Cwiklinski <johan@x-tnd.be>
Wed, 5 Dec 2012 09:36:08 +0000 (10:36 +0100)
commit892e289949e0bc3f8c9e289b875b40396c7a737d
tree15b78df95b9316e1854ffe2449afc9a24f536b90
parentbf5011b2e06c70f101513fb7653825b4cbfb934b
parent5179183a169d5408f1a262202385fe9217d4c3c1
Merge branch 'hotfix/0.7.2.4' into develop

Conflicts:
galette/ajax_plugins_initdb.php
galette/ajax_plugins_initdb.php
galette/includes/galette.inc.php
galette/includes/sql_parse.php
galette/install/index.php