]> git.agnieray.net Git - galette.git/commitdiff
Merge branch 'hotfix/0.7.4.4' into develop
authorJohan Cwiklinski <johan@x-tnd.be>
Sat, 29 Jun 2013 21:24:24 +0000 (23:24 +0200)
committerJohan Cwiklinski <johan@x-tnd.be>
Sat, 29 Jun 2013 21:24:24 +0000 (23:24 +0200)
Conflicts:
galette/ajouter_adherent.php
galette/docs/CHANGES
galette/includes/galette.inc.php

1  2 
galette/ajouter_adherent.php

Simple merge