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

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

diff --git a/lib/default.php b/lib/default.php
index 5e711bb87c9fcb82277da9c2292ad5be859ef762..4ebddcae4f0ca14e5b21747af4e4080a81c3b618 100644 (file)
--- a/lib/default.php
+++ b/lib/default.php
@@ -247,6 +247,7 @@ $default =
                                 'application/vnd.oasis.opendocument.text-web'               => 'oth',
                                 'application/pdf'   => 'pdf',
                                 'application/zip'   => 'zip',
+                                'application/x-bzip2' => 'bz2',
                                 'application/x-go-sgf' => 'sgf',
                                 'application/xml'   => 'xml',
                                 'application/gpx+xml' => 'gpx',
@@ -355,7 +356,6 @@ $default =
                             'OpportunisticQM' => array(),
                             'OStatus' => array(),
                             'Poll' => array(),
-                            'SearchSub' => array(),
                             'SimpleCaptcha' => array(),
                             'TagSub' => array(),
                             'WebFinger' => array(),