[galette-commits] [GIT] galette/galette.git branch, develop, updated. 0.7.6-24-g10116f5

[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  10116f50ef846c570d01addd99e6a113b3d42118 (commit)
       via  87eaf3e3f570505413c424fb0f80da3d0edcd909 (commit)
       via  5daaa52f2116ef86a897bebee3907a56370c873a (commit)
       via  746f3d90558ea66ec69f901db9192f962e1df1bb (commit)
       via  e5803b8345a55bdcdb85a33522ebbfd44387b73f (commit)
       via  88eee7838cdc959200da3878a4f282b8e4465ded (commit)
       via  9aa77c06a087b9d738c82b3fb88eb228ee9e1b7c (commit)
       via  0d820ecbd913e58a1b2c4c6c392ac0cf083f77c0 (commit)
      from  85e1f2035af643f38850d6bb46abbf97499e0942 (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 10116f50ef846c570d01addd99e6a113b3d42118
Merge: 85e1f20 87eaf3e
Author: Johan Cwiklinski <johan@xxxxxxxx>
Date:   Tue Oct 29 23:07:01 2013 +0100

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

commit 87eaf3e3f570505413c424fb0f80da3d0edcd909
Author: Johan Cwiklinski <johan@xxxxxxxx>
Date:   Tue Oct 29 23:06:12 2013 +0100

    Update changelog

commit 5daaa52f2116ef86a897bebee3907a56370c873a
Author: Johan Cwiklinski <johan@xxxxxxxx>
Date:   Tue Oct 29 22:01:24 2013 +0100

    Wrong creation date at member instantiation; fixes #741

commit 746f3d90558ea66ec69f901db9192f962e1df1bb
Author: Johan Cwiklinski <johan@xxxxxxxx>
Date:   Tue Oct 22 21:58:57 2013 +0200

    Fixe memberslist CSV export; fixes #732

commit e5803b8345a55bdcdb85a33522ebbfd44387b73f
Author: Johan Cwiklinski <johan@xxxxxxxx>
Date:   Sun Oct 20 21:48:57 2013 +0200

    Import model could not be changed; fixes #728

commit 88eee7838cdc959200da3878a4f282b8e4465ded
Author: Johan Cwiklinski <johan@xxxxxxxx>
Date:   Sun Oct 20 21:48:19 2013 +0200

    Bump version

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

Summary of changes:
 galette/docs/CHANGES                       |    7 ++++++-
 galette/import_model.php                   |    4 +++-
 galette/lib/Galette/Entity/Adherent.php    |    2 +-
 galette/lib/Galette/Entity/ImportModel.php |    2 +-
 galette/lib/Galette/IO/CsvOut.php          |    2 +-
 5 files changed, 12 insertions(+), 5 deletions(-)


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

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