diff options
| author | Evan Prodromou <evan@prodromou.name> | 2008-09-16 17:08:13 -0400 |
|---|---|---|
| committer | Evan Prodromou <evan@prodromou.name> | 2008-09-16 17:08:13 -0400 |
| commit | eb4df223e6bb63c4a81e744c74b2f7fae335a8a0 (patch) | |
| tree | 9dd6806d23898d5032f6f45d486f3ad1a6e1fc06 /lib/common.php | |
| parent | 219927cb7924a33a4e73aabe78218c0dc22bfc0c (diff) | |
integrate local changes with Zach's
darcs-hash:20080916210813-84dde-c2cadb63b09f59ac6c76dc1205a56687de9483ce.gz
Diffstat (limited to 'lib/common.php')
| -rw-r--r-- | lib/common.php | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/common.php b/lib/common.php index 8ea8fa0fa..71a75ff10 100644 --- a/lib/common.php +++ b/lib/common.php @@ -97,7 +97,13 @@ $config = 'daemon' => array('piddir' => '/var/run', 'user' => false, - 'group' => false) + 'group' => false), + 'integration' => + array('source' => 'Laconica'), # source attribute for Twitter + 'memcached' => + array('enabled' => false, + 'server' => 'localhost', + 'port' => 11211) ); $config['db'] = &PEAR::getStaticProperty('DB_DataObject','options'); |