Merge remote-tracking branch 'origin/master' into next

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
This commit is contained in:
Arne Fitzenreiter
2019-04-11 07:30:26 +02:00
8 changed files with 103 additions and 2 deletions

View File

@@ -24,9 +24,10 @@
NAME="IPFire" # Software name
SNAME="ipfire" # Short name
<<<<<<< HEAD
VERSION="2.23" # Version number
CORE="130" # Core Level (Filename)
PAKFIRE_CORE="129" # Core Level (PAKFIRE)
CORE="131" # Core Level (Filename)
PAKFIRE_CORE="130" # 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