hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'development' into LTS_development

Browse source 
# Conflicts:
#	src/controller/controller_api.cpp
This commit is contained in:
Thulinma 2019-01-16 15:53:57 +01:00
commit d82fc394e1
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/controller/controller_api.cpp
View file

@ -744,7 +744,7 @@ void Controller::handleAPICommands(JSON::Value & Request, JSON::Value & Response
if (!Request.isMember("minimal") || Request.isMember("config")){
Response["config"] = Controller::Storage["config"];
Response["config"]["iid"] = instanceId;
Response["config"]["version"] = PACKAGE_VERSION;
Response["config"]["version"] = PACKAGE_VERSION " " RELEASE;
/*LTS-START*/
#ifdef LICENSING
Response["config"]["license"] = getLicense();