diff options
| author | Sarven Capadisli <csarven@status.net> | 2009-11-02 17:21:23 +0000 |
|---|---|---|
| committer | Sarven Capadisli <csarven@status.net> | 2009-11-02 17:21:23 +0000 |
| commit | eaae5a4c90249330034e8ee1004e85ae6399fe70 (patch) | |
| tree | 36c5e1420b4340773f7b6cca4ceca0c075869938 /lib/default.php | |
| parent | 4aa6deb8abb725be7fa6dc30bdfd2e7de1ff24d1 (diff) | |
| parent | 5581143bee602dbd5417f532f2b483e58d0a4269 (diff) | |
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'lib/default.php')
| -rw-r--r-- | lib/default.php | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/lib/default.php b/lib/default.php index 7ec8558b0..f6cc4b725 100644 --- a/lib/default.php +++ b/lib/default.php @@ -228,8 +228,6 @@ $default = array('contentlimit' => null), 'message' => array('contentlimit' => null), - 'http' => - array('client' => 'curl'), // XXX: should this be the default? 'location' => array('namespace' => 1), // 1 = geonames, 2 = Yahoo Where on Earth ); |