Merge branch 'development' into LTS_development

This commit is contained in:
Thulinma 2019-05-23 12:42:19 +02:00
commit 26c9f964be
8 changed files with 44 additions and 9 deletions

View file

@ -220,6 +220,7 @@ namespace Mist {
Util::Config::streamName = streamName;
if (config->getBool("json")) {
capa["version"] = PACKAGE_VERSION;
std::cout << capa.toString() << std::endl;
return 0;
}