diff options
| author | Sarven Capadisli <csarven@status.net> | 2009-12-14 18:34:16 -0500 |
|---|---|---|
| committer | Sarven Capadisli <csarven@status.net> | 2009-12-14 18:34:16 -0500 |
| commit | 27d0e8f0a411488cd2a09009759078501102c7a1 (patch) | |
| tree | a9e223fefe72e1cb169a3dc97bdbf5bca0f2799c /lib | |
| parent | f8b187d5a4ac5eab1f025d61e30d5244cef6123d (diff) | |
| parent | 1aae7f382ffb7d709417ecc560e37535d64e6a4d (diff) | |
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'lib')
| -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), ); |