]> git.agnieray.net Git - galette.git/commit - galette/config/paths.inc.php
Merge branch 'hotfix/0.7.0.2' into develop
authorJohan Cwiklinski <johan@x-tnd.be>
Thu, 19 Jul 2012 21:33:16 +0000 (23:33 +0200)
committerJohan Cwiklinski <johan@x-tnd.be>
Thu, 19 Jul 2012 21:33:16 +0000 (23:33 +0200)
commitfb19f93aa8e12cc7f3349ad4d777edce16165785
tree833ddac78f38a8aead7f9efa595a56a515c3cb21
parenta2726c5c442697d9b12bd62433c5ed867c24872c
parentb7f5659c5319cf1eb3b9d6b49e8be5a77a611c34
Merge branch 'hotfix/0.7.0.2' into develop

Conflicts:
galette/ajouter_contribution.php
galette/includes/galette.inc.php