Merge branch 'master' of https://github.com/fusionpbx/fusionpbx · 7e11c4cc17 - Gogs

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

Conflicts:
	root.php

reliberate 10 years ago

parent

9d40ba316c af491ac27b

commit

7e11c4cc17

1 changed files with 2 additions and 0 deletions

Split View Show Diff Stats

						
							+ 2
							
							- 0
						
root.php
							 
								View File
							
				@@ -46,4 +46,6 @@
			
				 		if(!defined('PROJECT_PATH')) { define('PROJECT_PATH', ''); }
			
				 		set_include_path( get_include_path() . PATH_SEPARATOR . $_SERVER['DOCUMENT_ROOT'] );
			
				 	}
			
				+
			
				+// test
			
				 ?>