Merge remote-tracking branch 'ms/ddns.cgi-fixes' into next

Conflicts:
	html/cgi-bin/ddns.cgi
This commit is contained in:
Michael Tremer
2014-08-07 21:06:13 +02:00
21 changed files with 439 additions and 88 deletions

View File

@@ -25,8 +25,8 @@
NAME="IPFire" # Software name
SNAME="ipfire" # Short name
VERSION="2.15" # Version number
CORE="80" # Core Level (Filename)
PAKFIRE_CORE="80" # Core Level (PAKFIRE)
CORE="81" # Core Level (Filename)
PAKFIRE_CORE="81" # Core Level (PAKFIRE)
GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` # Git Branch
SLOGAN="www.ipfire.org" # Software slogan
CONFIG_ROOT=/var/ipfire # Configuration rootdir