Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
Conflicts: classes/Profile.php
This commit is contained in:
commit
41dc9ca497
@ -1324,7 +1324,7 @@ class Profile extends Memcached_DataObject
|
||||
return $profile;
|
||||
}
|
||||
|
||||
function getLists($showPrivate)
|
||||
function getLists()
|
||||
{
|
||||
$ids = array();
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user