]> git.agnieray.net Git - galette.git/commitdiff
Projects / galette.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4328f09 41fe05b)
Merge branch 'hotfix/0.7.4.5' into develop
authorJohan Cwiklinski <johan@x-tnd.be>
Fri, 5 Jul 2013 20:07:22 +0000 (22:07 +0200)
committerJohan Cwiklinski <johan@x-tnd.be>
Fri, 5 Jul 2013 20:07:22 +0000 (22:07 +0200)
Conflicts:
galette/config/versions.inc.php
galette/includes/galette.inc.php


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