eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x

Browse Source 
Conflicts:
	classes/Profile.php
This commit is contained in:
Evan Prodromou 2011-04-14 18:28:03 -04:00
commit 41dc9ca497
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
classes/Profile.php
View File

@ -1324,7 +1324,7 @@ class Profile extends Memcached_DataObject
return $profile; return $profile;
} }
function getLists($showPrivate) function getLists()
{ {
$ids = array(); $ids = array();