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 "IPFire 2.x development tree".

The branch, next has been updated via 1307df22574f5c4a04b79510b181e17fa33bad5d (commit) via faec909e1aa3d164739a8740d0958cc8e420a6a7 (commit) via bc051eac54375a7f90b1d157414610f58de8c34a (commit) from f5662122b5d5e1dba35d8de599597ac9f1870623 (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 1307df22574f5c4a04b79510b181e17fa33bad5d Merge: f5662122b faec909e1 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sat Jun 15 18:09:06 2019 +0200

Merge branch 'master' into next

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

Summary of changes: html/cgi-bin/vpnmain.cgi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

Difference in files: diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi index 4b737b3a8..fbc274919 100644 --- a/html/cgi-bin/vpnmain.cgi +++ b/html/cgi-bin/vpnmain.cgi @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2013 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2019 IPFire Team info@ipfire.org # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -3338,7 +3338,7 @@ sub make_algos($$$$$) { push(@algo, $int); }

- if ($pfs || $grp eq "none") { + if ($pfs || $grp eq "none") { # noop } elsif ($grp =~ m/^e(.*)$/) { push(@algo, "ecp$1");

hooks/post-receive -- IPFire 2.x development tree