Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x

[quix0rs-gnu-social.git] / config.php.sample

diff --git a/config.php.sample b/config.php.sample
index 5291641087f5d7c507ac35ded8a97dcaf94419c2..d42bac9a6920be6fd97332b5553f364f8b96fd76 100644 (file)
--- a/config.php.sample
+++ b/config.php.sample
@@ -154,6 +154,9 @@ $config['sphinx']['port'] = 3312;
 // $config['integration']['source'] = 'Laconica';
 
 // Enable bidirectional Twitter bridge
+//
+// NOTE: if you enable this you must also set $config['avatar']['path']
+//
 // $config['twitterbridge']['enabled'] = true;
 
 // Edit throttling. Off by default. If turned on, you can only post 20 notices