]> git.agnieray.net Git - galette.git/commit - galette/includes/main.inc.php
Merge branch 'hotfix/0.9.1.1' into develop
authorJohan Cwiklinski <johan@x-tnd.be>
Wed, 9 May 2018 05:17:45 +0000 (07:17 +0200)
committerJohan Cwiklinski <johan@x-tnd.be>
Wed, 9 May 2018 05:17:45 +0000 (07:17 +0200)
commit3ec5b47c8fc53174d3fa4f6f40d2ebed4f40cccb
tree8563bb31609ecb8de3ea423383a8edc7bb174ac1
parent139c204a736467814d5e48c2baa80ec795d7884a
parent04cac81f38d4077a60e81e5c0b6422c07d85c82b
Merge branch 'hotfix/0.9.1.1' into develop