friendica/dir
6
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge remote-tracking branch 'friendika/master' into newui

Browse source
This commit is contained in:
fabrixxm 2011-08-17 17:35:37 +02:00
commit bdf42473a0
101 changed files with 9898 additions and 6112 deletions
Download patch file Download diff file Expand all files Collapse all files

3
mod/network.php
View file

@ -297,9 +297,8 @@ function network_content(&$a, $update = 0) {
$o .= conversation($a,$r,$mode,$update);
if(! $update) {
$o .= paginate($a);
$o .= '<div class="cc-license">' . t('Shared content is covered by the <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0</a> license.') . '</div>';
$o .= cc_license();
}
return $o;