[Fusionforge-commits] FusionForge branch feature/twig-template-engine updated. f96d12c2ebd969cf2146018cc5e3e7a022283b99

[Roland Mas]

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, feature/twig-template-engine has been updated
       via  f96d12c2ebd969cf2146018cc5e3e7a022283b99 (commit)
       via  4395dfc60a992480a2aad502697f84dd81ba3931 (commit)
       via  871cfcfe078ef84e94be36eeb3c7dff133fa35e9 (commit)
       via  693078285164bcd1af40779f8fdc0f4a57da46a8 (commit)
      from  6ff9661621451acb1a56d3d3d4839ab9f0487ee3 (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 f96d12c2ebd969cf2146018cc5e3e7a022283b99
Merge: 6ff9661 4395dfc
Author: Roland Mas <lolando at debian.org>
Date:   Wed Oct 8 16:26:37 2014 +0200

    Merge branch 'master' into feature/twig-template-engine

diff --cc autoinstall/install-src.sh
index f94a059,c35afcd..13806e9
--- a/autoinstall/install-src.sh
+++ b/autoinstall/install-src.sh
@@@ -31,9 -31,8 +31,9 @@@ if [ -e /etc/debian_version ]; the
      apt-get update
      apt-get install -y make gettext php5-cli php5-pgsql php-htmlpurifier \
  	apache2 locales-all postgresql libnss-pgsql2 unscd \
- 	subversion augeas-tools viewvc git gitweb \
+ 	subversion augeas-tools viewvc git \
  	mediawiki \
 +	php-twig \
  	python-moinmoin libapache2-mod-wsgi python-psycopg2
  else
      backports_rpm

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

Summary of changes:
 autoinstall/install-src.sh        |    4 ++--
 src/debian/plugins                |    2 +-
 src/plugins/scmgit/bin/install.sh |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
FusionForge