[galette-commits] [GIT] galette/galette.git branch, develop, updated. 0.7.2.6-49-g2f7fafb

[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  2f7fafba7cc4d69d5a1af6cf13f22aad2aa81c12 (commit)
       via  f13ebb4f6ba1f58739b4e9b2fc673a5a5ea21555 (commit)
       via  33b17424b4489e79eb5fc176a48b4b6d33bf225c (commit)
       via  674dc57ff15b922db20ed89020cb6c74ec5ea04e (commit)
       via  8ed88fcff1a336ae992ad52b0e12e4b9c7da7fb3 (commit)
       via  518cba4f9ddf472ffa27e31bc38aefd0931d1799 (commit)
       via  1a76284237e158b0100bf0d18710c027fda455e7 (commit)
       via  3ddfa98e12b63feb96f6cb608c929cfb488164f1 (commit)
      from  c754dc3236122272bd2ba27e04fe10e6822626c6 (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 2f7fafba7cc4d69d5a1af6cf13f22aad2aa81c12
Merge: c754dc3 f13ebb4
Author: Johan Cwiklinski <johan@xxxxxxxx>
Date:   Fri Dec 14 22:22:14 2012 +0100

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

commit f13ebb4f6ba1f58739b4e9b2fc673a5a5ea21555
Author: Johan Cwiklinski <johan@xxxxxxxx>
Date:   Fri Dec 14 21:39:48 2012 +0100

    Error on groups management page from manager; fixes #404 (will fix be found? :p)

commit 33b17424b4489e79eb5fc176a48b4b6d33bf225c
Author: Johan Cwiklinski <johan@xxxxxxxx>
Date:   Fri Dec 14 21:21:51 2012 +0100

    Bad logger constant

commit 674dc57ff15b922db20ed89020cb6c74ec5ea04e
Author: Johan Cwiklinski <johan@xxxxxxxx>
Date:   Fri Dec 14 21:20:37 2012 +0100

    Use member prefered language at login; fixes #451

commit 8ed88fcff1a336ae992ad52b0e12e4b9c7da7fb3
Author: Johan Cwiklinski <johan@xxxxxxxx>
Date:   Fri Dec 14 21:03:35 2012 +0100

    Use member prefered language to send mails; refs #451

commit 518cba4f9ddf472ffa27e31bc38aefd0931d1799
Author: Johan Cwiklinski <johan@xxxxxxxx>
Date:   Fri Dec 14 20:25:40 2012 +0100

    Change language only if we're from self_adherent or install pages; refs #451

commit 1a76284237e158b0100bf0d18710c027fda455e7
Author: Johan Cwiklinski <johan@xxxxxxxx>
Date:   Fri Dec 14 19:13:57 2012 +0100

    Bump version

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

Summary of changes:
 galette/ajouter_adherent.php        |    6 +++++-
 galette/includes/galette.inc.php    |    3 ++-
 galette/lib/Galette/Core/Login.php  |    3 ++-
 galette/lostpasswd.php              |    2 +-
 galette/self_adherent.php           |    2 +-
 galette/templates/default/group.tpl |    8 ++++----
 6 files changed, 15 insertions(+), 9 deletions(-)


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

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