Merge branch 'master' of https://github.com/fusionpbx/fusionpbx

Conflicts: root.php
2015-07-02 16:23:11 -06:00 · 2015-07-02 16:23:11 -06:00 · 902f8f9019
parent dddefb7b42 0cff228558
commit 902f8f9019
1 changed files with 2 additions and 0 deletions
--- a/root.php
+++ b/root.php
@ -46,4 +46,6 @@
 		if(!defined('PROJECT_PATH')) { define('PROJECT_PATH', ''); }
 		set_include_path( get_include_path() . PATH_SEPARATOR . $_SERVER['DOCUMENT_ROOT'] );
 	}
+
+// test
 ?>