Fix merge.

diff --git a/lib/pleroma/user/info.ex b/lib/pleroma/user/info.ex
index 6829c26f6e664b700805d770c642504aeb6365a2..7a99787f81a78405e3253cbb07a290990fc68fff 100644 (file)
--- 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