Merge branch '0.7.x' into 0.8.x

diff --git a/config.php.sample b/config.php.sample
index 6601acc7e98e892be01b24ce3fd13e23b3f605c8..4c4c9f08bc11b2947d22dfe66a18c89b42dbc490 100644 (file)
--- a/config.php.sample
+++ b/config.php.sample
@@ -31,6 +31,8 @@ $config['site']['path'] = 'laconica';
 #$config['site']['closed'] = true;
 #Only allow registration for people invited by another user
 #$config['site']['inviteonly'] = true;
+#Make the site invisible to  non-logged-in users
+#$config['site']['private'] = true;
 
 # If you want logging sent to a file instead of syslog
 #$config['site']['logfile'] = '/tmp/laconica.log';