]> git.agnieray.net Git - galette.git/commitdiff
Merge branch 'hotfix/0.7.5.4' into develop
authorJohan Cwiklinski <johan@x-tnd.be>
Sun, 6 Oct 2013 15:53:07 +0000 (17:53 +0200)
committerJohan Cwiklinski <johan@x-tnd.be>
Sun, 6 Oct 2013 15:53:07 +0000 (17:53 +0200)
1  2 
galette/lib/Galette/Repository/Members.php
galette/templates/default/member.tpl

Simple merge