Merge branch 'master' of https://github.com/OpencachingDeutschland/oc-server3

2012-11-04 22:20:54 +01:00
parent d6ae786829 004fc4feca
commit 61defe9ddd
123 changed files with 14341 additions and 11853 deletions
@@ -245,11 +245,4 @@
 	// (e.g. xml-interface and mapserver-results)
 	// you can use -1 to use the master (not recommended, because replicated to slaves)
 	$opt['db']['slave']['primary'] = -1;
-
-	$OKAPI_SETTINGS = array(
-		'OC_BRANCH' => 'oc.de',
-		'SITELANG' => 'de',
-		'VAR_DIR' => $rootpath.'var',
-	);
-
 ?>