[galette-commits] [GIT] galette/galette.git branch, develop, updated. 0.7.1.6-61-gdefcc02

[git@xxxxxxxxxxxxx]

This is an automated email from git. It was enerated because a ref
change was pushed to the repository "galette/galette.git".

The branch, develop has been updated
       via  defcc029b551e2b01af91b1b29a12d8cc2f991e2 (commit)
       via  cbfc3c4a95388338932bb76f94b4bb928f970603 (commit)
       via  c1e3831e6faa7efe4a4479f964227f9b29b2e415 (commit)
       via  c23249a9914480989dd1380ef2738b2598dffe82 (commit)
       via  5fdbf94b04c061dc4f9819b8c3c9feb52adcee00 (commit)
       via  75402f1bfa1cc5a32a63bf9fd9cc5cdd692d9077 (commit)
      from  b25afcaba1068d7d47d9153edd7913d8964a85f7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit defcc029b551e2b01af91b1b29a12d8cc2f991e2
Merge: b25afca cbfc3c4
Author: Johan Cwiklinski <johan@xxxxxxxx>
Date:   Thu Oct 18 19:49:40 2012 +0200

    Merge branch 'hotfix/0.7.1.7' into develop
    
    Conflicts:
    	galette/includes/galette.inc.php

commit cbfc3c4a95388338932bb76f94b4bb928f970603
Author: Johan Cwiklinski <johan@xxxxxxxx>
Date:   Thu Oct 18 19:48:21 2012 +0200

    Display logo on install page; fixes #379

commit c1e3831e6faa7efe4a4479f964227f9b29b2e415
Author: Johan Cwiklinski <johan@xxxxxxxx>
Date:   Thu Oct 18 19:24:10 2012 +0200

    IE9 display issue; fixes #382

commit c23249a9914480989dd1380ef2738b2598dffe82
Author: Johan Cwiklinski <johan@xxxxxxxx>
Date:   Thu Oct 18 19:23:27 2012 +0200

    Staff members are not visually identified in the list; fixes #381

commit 5fdbf94b04c061dc4f9819b8c3c9feb52adcee00
Author: Johan Cwiklinski <johan@xxxxxxxx>
Date:   Thu Oct 18 19:22:41 2012 +0200

    Bump version

-----------------------------------------------------------------------

Summary of changes:
 galette/includes/galette.inc.php        |    1 -
 galette/install/index.php               |    2 +-
 galette/lib/Galette/Entity/Adherent.php |    2 +-
 galette/templates/default/ie.css        |    4 ++++
 4 files changed, 6 insertions(+), 3 deletions(-)


hooks/post-receive
--
galette/galette.git

-- 
-- 
Galette repositories commits - http://galette.tuxfamily.org