Merge branch 'nightly' of git.gnu.io:gnu/gnu-social into nightly

[quix0rs-gnu-social.git] / lib / default.php

diff --git a/lib/default.php b/lib/default.php
index 0ec9fc4e14d1cc5a67c2f9b7316b17b526797733..5bec29cc5233880c169f0dcf3da8828748c23302 100644 (file)
--- a/lib/default.php
+++ b/lib/default.php
@@ -129,7 +129,7 @@ $default =
               'biolimit' => null,
               'changenick' => false,
               'backup' => true,
-              'restore' => true,
+              'restore' => false,
               'delete' => false,
               'move' => true),
         'image' =>
@@ -327,7 +327,6 @@ $default =
                             'OpportunisticQM' => array(),
                             'OStatus' => array(),
                             'Poll' => array(),
-                            'QnA' => array(),
                             'SearchSub' => array(),
                             'TagSub' => array(),
                             'WebFinger' => array(),