From: lain <lain@soykaf.club>
Date: Wed, 5 Dec 2018 20:27:56 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin' into follower-hiding
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=76d6b1c6ab2813b1fb8f4473e4d722cc32fb2fed;p=akkoma

Merge remote-tracking branch 'origin' into follower-hiding
---

76d6b1c6ab2813b1fb8f4473e4d722cc32fb2fed
diff --cc lib/pleroma/user/info.ex
index cefe33577,49b2f0eda..6829c26f6
--- a/lib/pleroma/user/info.ex
+++ b/lib/pleroma/user/info.ex
@@@ -136,7 -135,7 +136,8 @@@ defmodule Pleroma.User.Info d
        :no_rich_text,
        :default_scope,
        :banner,
 +      :hide_network
+       :background
      ])
    end