diff options
| author | Evan Prodromou <evan@status.net> | 2009-11-07 13:03:52 -0500 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2009-11-07 13:03:52 -0500 |
| commit | d9cde0ef80ee838a99035d44f0286b3cc902e332 (patch) | |
| tree | ac9d74d52a06890db71f61ac934e75b937c19753 /lib/default.php | |
| parent | f2b642ce822c480cfc418c38106cc18c3a428cf4 (diff) | |
| parent | 2d8ad0409d8e78ec35a65156bc375eacbe561963 (diff) | |
Merge branch '0.9.x' into userflag
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 ); |