]> git.agnieray.net Git - galette.git/commit
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)
commit861cd2d36bba81de42cfbee60cc68e424160bf50
treea206221b173d82cdb6f746177b5f4face77f3061
parent95475de6a4308cb6280f67f8c7e8863902ada114
parent6e5a18670a36a0885f3f5065ed970e4d08ecdfc2
Merge branch 'release/0.7.1' into develop

Conflicts:
galette/includes/dynamic_fields.inc.php
galette/includes/html5-ie.js
galette/templates/default/ie.css
galette/templates/default/galette.css