We are no longer offering accounts on this server. Consider https://gitlab.freedesktop.org/ as a place to host projects.

Commit 41dc9ca4 authored by Evan Prodromou's avatar Evan Prodromou

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

Conflicts:
	classes/Profile.php
parents 3df69fe5 70c8de43
......@@ -1324,7 +1324,7 @@ class Profile extends Memcached_DataObject
return $profile;
}
function getLists($showPrivate)
function getLists()
{
$ids = array();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment