summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorSarven Capadisli <csarven@status.net>2010-03-04 11:57:40 -0500
committerSarven Capadisli <csarven@status.net>2010-03-04 11:57:40 -0500
commitef6620e5b2787ce5ee34974f3770be1d9963be4a (patch)
treeccd6c3b5d39ffdb350ab8a412ab492f1529167d7 /lib
parent1831506885ad31c14eb1c4c87274c299fbf39957 (diff)
parent02f49193d5eaee108899b38678334f775dee596f (diff)
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
Diffstat (limited to 'lib')
-rw-r--r--lib/default.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/default.php b/lib/default.php
index 8e99a0e1c..bdd78d4d8 100644
--- a/lib/default.php
+++ b/lib/default.php
@@ -280,6 +280,7 @@ $default =
'TightUrl' => array('shortenerName' => '2tu.us', 'freeService' => true,'serviceUrl'=>'http://2tu.us/?save=y&url=%1$s'),
'Geonames' => null,
'Mapstraction' => null,
+ 'OStatus' => null,
'WikiHashtags' => null,
'OpenID' => null),
),