Merge remote-tracking branch 'upstream/master'

2011-09-25 13:30:55 -05:00
parent cb1c6dd1e3 6a9e22550d
commit 3426ce5f94
10 changed files with 2 additions and 419 deletions
--- a/mod/network.php
+++ b/mod/network.php
@@ -408,7 +408,6 @@ function network_content(&$a, $update = 0) {

 	if(! $update) {
 		$o .= paginate($a);
-		$o .= cc_license();
 	}

 	return $o;