[galette-commits] [GIT] galette/galette.git branch, develop, updated. 0.7.4.4-52-g0f4d42e

[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  0f4d42e173172bd4b44bda5934767982cfe54b15 (commit)
       via  41fe05bff946e42caa34e6d4d59c8e26df671366 (commit)
       via  dd5ab9e8456744be24f7747df9e3734c22313561 (commit)
       via  3e6f49fdc04950d24af2c9e701e9e061c30f4bdc (commit)
       via  5588c9eb5dce9d64b6232798ba090576034d0f46 (commit)
       via  0791652c52baf6dc62ac338764f2814aa3da3d09 (commit)
      from  4328f09d2d1c478ba7c3b64ea9ddc51dc4d71e58 (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 0f4d42e173172bd4b44bda5934767982cfe54b15
Merge: 4328f09 41fe05b
Author: Johan Cwiklinski <johan@xxxxxxxx>
Date:   Fri Jul 5 22:07:22 2013 +0200

    Merge branch 'hotfix/0.7.4.5' into develop
    
    Conflicts:
    	galette/config/versions.inc.php
    	galette/includes/galette.inc.php

commit 41fe05bff946e42caa34e6d4d59c8e26df671366
Author: Johan Cwiklinski <johan@xxxxxxxx>
Date:   Fri Jul 5 22:06:18 2013 +0200

    Update changelog

commit dd5ab9e8456744be24f7747df9e3734c22313561
Author: Johan Cwiklinski <johan@xxxxxxxx>
Date:   Fri Jul 5 22:05:09 2013 +0200

    Update 3rd party libs

commit 3e6f49fdc04950d24af2c9e701e9e061c30f4bdc
Author: Johan Cwiklinski <johan@xxxxxxxx>
Date:   Fri Jul 5 21:51:27 2013 +0200

    No confirmation asked on member deletion; fixes #638

commit 5588c9eb5dce9d64b6232798ba090576034d0f46
Author: Johan Cwiklinski <johan@xxxxxxxx>
Date:   Fri Jul 5 21:50:50 2013 +0200

    Bump version

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

Summary of changes:
 galette/config/versions.inc.php                 |    4 ++--
 galette/docs/CHANGES                            |    5 +++++
 galette/templates/default/gestion_adherents.tpl |    2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)


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

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