diff options
| author | Sarven Capadisli <csarven@status.net> | 2009-11-02 14:53:31 +0000 |
|---|---|---|
| committer | Sarven Capadisli <csarven@status.net> | 2009-11-02 14:53:31 +0000 |
| commit | 8a07c7d7c021693271d1856f15dfe0abd9461d5d (patch) | |
| tree | 1846465919fd94a2056c0154782d687242285fd6 /lib/default.php | |
| parent | ebd604cf6b6fda6823437cafc1d2db3eb23d9f41 (diff) | |
| parent | fa37967858c3c29000797e510e5f98aca8ab558f (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 ); |