Merge branch 'cmake-port' into master

Conflicts:
	CMakeLists.txt
	lib/init.php
	settings/settings.php
This commit is contained in:
Sarah Hoffmann
2016-03-16 19:45:18 +01:00
20 changed files with 78 additions and 39 deletions

View File

@@ -1,8 +1,5 @@
<?php
@define('CONST_BasePath', dirname(dirname(__FILE__)));
require_once('settings/settings.php');
require_once(CONST_BasePath.'/lib/lib.php');
require_once(CONST_BasePath.'/lib/leakybucket.php');
require_once(CONST_BasePath.'/lib/db.php');