Merge remote-tracking branch 'upstream/master' into social-master

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

diff --git a/lib/default.php b/lib/default.php
index b153027233099169d71de98b1c4465a9522c2955..65293a8c934342d0de76023da1b7a8993745506e 100644 (file)
--- a/lib/default.php
+++ b/lib/default.php
@@ -140,11 +140,6 @@ $default =
               'path' => $_path . '/avatar/',
               'ssl' => null,
               'maxsize' => 300),
-        'background' =>
-        array('server' => null,
-              'dir' => INSTALLDIR . '/background/',
-              'path' => $_path . '/background/',
-              'ssl' => null),
         'public' =>
         array('localonly' => false,
               'blacklist' => array(),