gitlabFork/ISPConfig3.git - Solinfo Gitblit

gitlabFork / ISPConfig3

ISPConfig3 devel

summary
reflog
commits
tree
docs
forks
compare

Merge remote-tracking branch 'ispc/master' into new-layout-3.1

Marius Cramer

2014-12-19 62e25488daa4f857f717d2687e820091ffaa8a13

 interface/web/keepalive.php

@@ -30,7 +30,7 @@

error_reporting(E_ALL|E_STRICT);

require_once('../lib/config.inc.php');
require_once('../lib/app.inc.php');
require_once '../lib/config.inc.php';
require_once '../lib/app.inc.php';

?>
?>

			@@ -30,7 +30,7 @@

			error_reporting(E_ALL\|E_STRICT);

			require_once('../lib/config.inc.php');
			require_once('../lib/app.inc.php');
			require_once '../lib/config.inc.php';
			require_once '../lib/app.inc.php';

			?>
			?>