]> git.agnieray.net Git - galette.git/commit - bin/release
Merge branch 'hotfix/0.7.2.6' into develop
authorJohan Cwiklinski <johan@x-tnd.be>
Sun, 9 Dec 2012 16:48:26 +0000 (17:48 +0100)
committerJohan Cwiklinski <johan@x-tnd.be>
Sun, 9 Dec 2012 16:48:26 +0000 (17:48 +0100)
commit93780de3b1dc34d24f8f0c7a51dc6906a6bf101e
tree555bbf2ac1bd8f582574eff490419ad41995a934
parent4ae8e1be1f477c38d8dba90c5d9292cfa780b832
parent467f27ff58f3aa9932cdfde3bf299a6a594de608
Merge branch 'hotfix/0.7.2.6' into develop

Conflicts:
galette/includes/galette.inc.php
galette/gestion_adherents.php
galette/index.php
galette/lostpasswd.php
galette/mailing_adherents.php
galette/plugins.php
galette/preferences.php
galette/self_adherent.php
galette/traduire_libelles.php
galette/voir_adherent.php