فهرست منبع

Merge branch 'release/170619' into develop

Daniel Gibbs 9 سال پیش
والد
کامیت
19d27ed2b8
1فایلهای تغییر یافته به همراه2 افزوده شده و 2 حذف شده
  1. 2 2
      linuxgsm.sh

+ 2 - 2
linuxgsm.sh

@@ -16,7 +16,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 	set -x
 fi
 fi
 
 
-version="170305"
+version="170619"
 shortname="core"
 shortname="core"
 gameservername="core"
 gameservername="core"
 rootdir="$(dirname $(readlink -f "${BASH_SOURCE[0]}"))"
 rootdir="$(dirname $(readlink -f "${BASH_SOURCE[0]}"))"
@@ -39,7 +39,7 @@ configdirdefault="${lgsmdir}/config-default"
 # from a different repo and/or branch.
 # from a different repo and/or branch.
 githubuser="GameServerManagers"
 githubuser="GameServerManagers"
 githubrepo="LinuxGSM"
 githubrepo="LinuxGSM"
-githubbranch="develop"
+githubbranch="master"
 
 
 # Core Function that is required first
 # Core Function that is required first
 core_functions.sh(){
 core_functions.sh(){