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

Commit 259a262d authored by Evan Prodromou's avatar Evan Prodromou

Merge branch 'master' of gitorious.org:statusnet/mainline

parents b475c871 98acec74
......@@ -127,6 +127,7 @@ abstract class ProfileBlock extends Widget
if (!empty($homepage)) {
array('href' => $homepage,
'rel' => 'me',
'class' => 'profile_block_homepage'),
......@@ -223,6 +223,7 @@ class RegisterThrottlePlugin extends Plugin
private function _getIpAddress()
$keys = array('HTTP_X_FORWARDED_FOR',
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