From: lain <lain@soykaf.club>
Date: Wed, 5 Dec 2018 20:31:02 +0000 (+0100)
Subject: Fix merge.
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=7d5720f2e40015502fe646b86768ab8454f571fe;p=akkoma

Fix merge.
---

diff --git a/lib/pleroma/user/info.ex b/lib/pleroma/user/info.ex
index 6829c26f6..7a99787f8 100644
--- a/lib/pleroma/user/info.ex
+++ b/lib/pleroma/user/info.ex
@@ -136,7 +136,7 @@ defmodule Pleroma.User.Info do
       :no_rich_text,
       :default_scope,
       :banner,
-      :hide_network
+      :hide_network,
       :background
     ])
   end