diff options
| author | Evan Prodromou <evan@status.net> | 2009-12-15 16:24:52 -0500 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2009-12-15 16:24:52 -0500 |
| commit | 2a1468ec8b2918553b490ddaef6bdede3e2d5b1b (patch) | |
| tree | c94a68a1239a5a3c35d5564323967fcd4ff14523 /lib/default.php | |
| parent | e9b733e7f036bc03353ae6dd7b096ea179698a4d (diff) | |
| parent | f3d27cc3ae92e2b7412dd998d7de7a2b58dc8e6a (diff) | |
Merge branch '0.9.x' into testing
Diffstat (limited to 'lib/default.php')
| -rw-r--r-- | lib/default.php | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/default.php b/lib/default.php index ebb6f8d01..42d4623b1 100644 --- a/lib/default.php +++ b/lib/default.php @@ -229,4 +229,6 @@ $default = array('namespace' => 1), // 1 = geonames, 2 = Yahoo Where on Earth 'omb' => array('timeout' => 5), // HTTP request timeout in seconds when contacting remote hosts for OMB updates + 'logincommand' => + array('disabled' => true), ); |