Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next

This commit is contained in:
Arne Fitzenreiter
2017-06-01 19:19:54 +02:00
83 changed files with 16749 additions and 7158 deletions

View File

@@ -25,8 +25,8 @@
NAME="IPFire" # Software name
SNAME="ipfire" # Short name
VERSION="2.19" # Version number
CORE="110" # Core Level (Filename)
PAKFIRE_CORE="110" # Core Level (PAKFIRE)
CORE="111" # Core Level (Filename)
PAKFIRE_CORE="111" # 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