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

This commit is contained in:
Stefan Schantl
2018-09-26 14:49:34 +02:00
554 changed files with 1394 additions and 1025 deletions

View File

@@ -26,7 +26,7 @@ NAME="IPFire" # Software name
SNAME="ipfire" # Short name
VERSION="2.21" # Version number
CORE="124" # Core Level (Filename)
PAKFIRE_CORE="123" # Core Level (PAKFIRE)
PAKFIRE_CORE="124" # 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