diff options
| author | Sarven Capadisli <csarven@controlyourself.ca> | 2009-05-07 16:07:55 +0000 |
|---|---|---|
| committer | Sarven Capadisli <csarven@controlyourself.ca> | 2009-05-07 16:07:55 +0000 |
| commit | c7d6e5b0157e1bab08351a326d09259476c06b70 (patch) | |
| tree | 597c6e6cbbcd24e6768d5284eda143db24ceb090 /lib/common.php | |
| parent | 6b064e40a78c7c6252433d60b08040f108570e8b (diff) | |
| parent | 5771f413bb28502540d3bc017bc58433e9b0abf9 (diff) | |
Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x
Diffstat (limited to 'lib/common.php')
| -rw-r--r-- | lib/common.php | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/common.php b/lib/common.php index 00e5b0bc2..abdc22c0e 100644 --- a/lib/common.php +++ b/lib/common.php @@ -143,6 +143,8 @@ $config = array('piddir' => '/var/run', 'user' => false, 'group' => false), + 'twitterbridge' => + array('enabled' => false), 'integration' => array('source' => 'Laconica', # source attribute for Twitter 'taguri' => $_server.',2009'), # base for tag URIs |