Merge https://github.com/friendica/friendica into pull

2012-09-21 18:10:32 -07:00
parent 5fd124eabe fa2156a9c1
commit b6b8f40fa9
8 changed files with 133 additions and 52 deletions
@@ -25,6 +25,13 @@
 		echo $file . "\n";
 		include_once($file);
 	}
+    
+    echo "Directory: object\n";
+	$files = glob('object/*.php');
+	foreach($files as $file) {
+		echo $file . "\n";
+		include_once($file);
+	}

 	echo "Directory: addon\n";
 	$dirs = glob('addon/*');