]> git.agnieray.net Git - galette.git/commit
Merge branch 'hotfix/0.7.3.2' into develop
authorJohan Cwiklinski <johan@x-tnd.be>
Sat, 19 Jan 2013 20:54:03 +0000 (21:54 +0100)
committerJohan Cwiklinski <johan@x-tnd.be>
Sat, 19 Jan 2013 20:54:03 +0000 (21:54 +0100)
commit03953102a22a74270005415167965a1c2568bb0f
treeb6be1064a11a430a7c44c625bb36b0a8ff54e3c3
parentd5821ae9dca0b60792b6720a2b993a9351a20704
parenta519e2ed3a42a8df404a6cd0d78c4ed1133fbf00
Merge branch 'hotfix/0.7.3.2' into develop

Conflicts:
galette/includes/galette.inc.php
galette/lib/Galette/Entity/Adherent.php