]> git.agnieray.net Git - galette.git/commit - galette/lib/Galette/Filters/MembersList.php
Merge branch 'feature/autoloader' into develop
authorJohan Cwiklinski <johan@x-tnd.be>
Fri, 2 Mar 2012 15:12:56 +0000 (16:12 +0100)
committerJohan Cwiklinski <johan@x-tnd.be>
Fri, 2 Mar 2012 15:12:56 +0000 (16:12 +0100)
commitec774e012d04e0e16d9bc562b951e12839bcd81a
treececc4bcc22d2d326722ac4bc73dd3ff9af2373c3
parentbaf2af1b0d071e87fc63af0b7d2171f97f1b33df
parenta0085c0834fca440ca29c8373970a1de995e6c8c
Merge branch 'feature/autoloader' into develop

Conflicts:
galette/ajouter_adherent.php
galette/ajouter_adherent.php