This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".
The branch, 6.0 has been updated
via f11aafd44c60c285e6f411e7be4c8a823b768253 (commit)
via dfc36f1da7c89e9bab5e7c715921198a783e0cc8 (commit)
from 046ef6af693c1403bfc047df3c1880dbce4550d5 (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 f11aafd44c60c285e6f411e7be4c8a823b768253
Merge: 046ef6a dfc36f1
Author: Sylvain Beucler <[email protected]>
Date: Tue Apr 14 11:39:58 2015 +0200
Merge branch 'Branch_5_3' into 6.0
Ignore locale changes from other branches (always sync through
translationproject.org)
Conflicts:
src/locale/fr.po
-----------------------------------------------------------------------
Summary of changes:
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
