]> git.agnieray.net Git - galette.git/commit - galette/config/paths.inc.php
Merge branch 'hotfix/0.7.6.1' into develop
authorJohan Cwiklinski <johan@x-tnd.be>
Tue, 29 Oct 2013 22:07:01 +0000 (23:07 +0100)
committerJohan Cwiklinski <johan@x-tnd.be>
Tue, 29 Oct 2013 22:07:01 +0000 (23:07 +0100)
commit10116f50ef846c570d01addd99e6a113b3d42118
tree65709d6e842c41da547db49eeafdf04c20516803
parent85e1f2035af643f38850d6bb46abbf97499e0942
parent87eaf3e3f570505413c424fb0f80da3d0edcd909
Merge branch 'hotfix/0.7.6.1' into develop

Conflicts:
galette/includes/galette.inc.php