[galette-commits] [GIT] galette/galette.git branch, develop, updated. 0.7.1.1-46-g65c71db |
[ Thread Index |
Date Index
| More lists.galette.eu/commits Archives
]
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 65c71db7257fb3893f69080b8e6cc82dcfc11b84 (commit)
via cbf13dcc4d485f4eaef1d04bd4f5d45f6a99cfbe (commit)
via 0bfc636507b68175090e442eceef2d4da2bd97ca (commit)
via 6ae80233492cf49b9a594ba145e64299d5ef8e37 (commit)
from ef27b9b67080bdca18aa7099b1d9569496fd631e (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 65c71db7257fb3893f69080b8e6cc82dcfc11b84
Merge: ef27b9b cbf13dc
Author: Johan Cwiklinski <johan@xxxxxxxx>
Date: Sun Oct 7 10:40:16 2012 +0200
Merge branch 'hotfix/0.7.1.2' into develop
Conflicts:
galette/includes/galette.inc.php
commit cbf13dcc4d485f4eaef1d04bd4f5d45f6a99cfbe
Author: Johan Cwiklinski <johan@xxxxxxxx>
Date: Sun Oct 7 10:39:19 2012 +0200
Bump version
commit 0bfc636507b68175090e442eceef2d4da2bd97ca
Author: Johan Cwiklinski <johan@xxxxxxxx>
Date: Sun Oct 7 10:38:37 2012 +0200
Late memberships and no membership filters must exclude exempted members
-----------------------------------------------------------------------
Summary of changes:
galette/lib/Galette/Repository/Members.php | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
hooks/post-receive
--
galette/galette.git
--
--
Galette repositories commits - http://galette.tuxfamily.org