]> git.agnieray.net Git - galette.git/commitdiff
Merge branch 'release/0.7.1' into develop
authorJohan Cwiklinski <johan@x-tnd.be>
Fri, 5 Oct 2012 22:38:51 +0000 (00:38 +0200)
committerJohan Cwiklinski <johan@x-tnd.be>
Fri, 5 Oct 2012 22:38:51 +0000 (00:38 +0200)
Conflicts:
galette/includes/dynamic_fields.inc.php
galette/includes/html5-ie.js
galette/templates/default/ie.css

1  2 
galette/templates/default/galette.css

Simple merge