[Fusionforge-commits] FusionForge branch Branch_5_2 updated. a305b1908390c10ebce9480191a03a1d168dccf7

Roland Mas lolando at fusionforge.org
Thu Nov 27 15:43:46 CET 2014


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, Branch_5_2 has been updated
       via  a305b1908390c10ebce9480191a03a1d168dccf7 (commit)
       via  149601837c492dc59c8e40673f233e86e809c8b5 (commit)
      from  f7f44902aa14964120d34eab865839d02f4c95fc (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 a305b1908390c10ebce9480191a03a1d168dccf7
Merge: f7f4490 1496018
Author: Roland Mas <lolando at debian.org>
Date:   Thu Nov 27 15:43:31 2014 +0100

    Merge branch 'Branch_5_1' into Branch_5_2
    
    Conflicts:
    	src/plugins/mediawiki/cronjobs/create-wikis.php


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

Summary of changes:
 src/plugins/mediawiki/cronjobs/create-wikis.php |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list