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, master has been updated
via 0de38f3deb6a3ce0f549006df24166b10af665cb (commit)
via dfd4e45b2cd274965a8c18b313496f2873546ff5 (commit)
via d43d651e12d12652468978ca3ebc66cadc3961f2 (commit)
via eb2d7870f281abb2b035e29454f01534f3f72a85 (commit)
via 7d3d2f397c43e9a7ec1f7dc4c83d8bb6a86235d9 (commit)
via e09cdbf685aaac178c74c24d482f3c1c9311a6f5 (commit)
via c347cbf2e3d8050f9d102b4ea1466e452b3d70e2 (commit)
from 07d6eb172c176b4bab8897c83d933687c6d85a0f (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 0de38f3deb6a3ce0f549006df24166b10af665cb
Merge: 07d6eb1 dfd4e45
Author: Roland Mas <[email protected]>
Date: Fri Mar 27 15:28:01 2015 +0100
Merge branch '6.0'
-----------------------------------------------------------------------
Summary of changes:
src/debian/control.in | 6 ++---
src/etc/httpd.conf.d/05-config-macros-scm.conf | 3 +--
src/etc/httpd.conf.d/50-vhosts-scm.conf | 19 ---------------
src/etc/httpd.conf.d/ssl-on-scm.inc | 3 +--
src/etc/httpd.conf.d/ssl-on.inc | 30 ++++++++++++++++++------
src/etc/httpd.conf.d/ssl-really-on.inc | 25 --------------------
src/post-install.d/web/web.sh | 11 ++++++---
7 files changed, 36 insertions(+), 61 deletions(-)
delete mode 100644 src/etc/httpd.conf.d/50-vhosts-scm.conf
delete mode 100644 src/etc/httpd.conf.d/ssl-really-on.inc
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
