Merge branch 'stable-3.1'

Marius Burkard

2016-02-10 88c307b0ef30a94ea5e9b52a1f9078bf04033d29

 server/lib/classes/system.inc.php

@@ -44,7 +44,7 @@
    */


   public function system(){
   public function __construct(){
      //global $go_info;
      //$this->server_id = $go_info['isp']['server_id'];
      //$this->server_conf = $go_info['isp']['server_conf'];