Merge branch 'master' of https://github.com/fusionpbx/fusionpbx
Conflicts: root.php
This commit is contained in:
commit
902f8f9019
2
root.php
2
root.php
|
|
@ -46,4 +46,6 @@
|
||||||
if(!defined('PROJECT_PATH')) { define('PROJECT_PATH', ''); }
|
if(!defined('PROJECT_PATH')) { define('PROJECT_PATH', ''); }
|
||||||
set_include_path( get_include_path() . PATH_SEPARATOR . $_SERVER['DOCUMENT_ROOT'] );
|
set_include_path( get_include_path() . PATH_SEPARATOR . $_SERVER['DOCUMENT_ROOT'] );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// test
|
||||||
?>
|
?>
|
||||||
Loading…
Reference in New Issue