Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Devlon Duthie 2011-09-25 13:30:55 -05:00
commit 3426ce5f94
10 changed files with 2 additions and 419 deletions

View file

@ -408,7 +408,6 @@ function network_content(&$a, $update = 0) {
if(! $update) {
$o .= paginate($a);
$o .= cc_license();
}
return $o;