]> git.agnieray.net Git - galette.git/commitdiff
Projects / galette.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e18fe98 a5a6eec)
Merge branch 'hotfix/0.7.1.5' into develop
authorJohan Cwiklinski <johan@x-tnd.be>
Mon, 8 Oct 2012 15:25:41 +0000 (17:25 +0200)
committerJohan Cwiklinski <johan@x-tnd.be>
Mon, 8 Oct 2012 15:25:41 +0000 (17:25 +0200)
Conflicts:
galette/includes/galette.inc.php


Trivial merge
Galette membership management web application towards non profit (personal repository) | https://galette.eu