nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' of https://github.com/friendica/friendica

Browse source 
Conflicts:
	include/config.php
	update.php
This commit is contained in:
Alexander Kampmann 2012-04-05 13:39:15 +02:00
commit 355c42cb30
1809 changed files with 48790 additions and 7152 deletions
Download patch file Download diff file Expand all files Collapse all files

2
mod/dirfind.php Executable file → Normal file
View file

@ -46,7 +46,7 @@ function dirfind_content(&$a) {
foreach($j->results as $jj) {
$o .= replace_macros($tpl,array(
'$url' => $jj->url,
'$url' => zrl($jj->url),
'$name' => $jj->name,
'$photo' => $jj->photo,
'$tags' => $jj->tags