Fix merge.

7d5720f2 · lain · 76d6b1c6 · 7d5720f2
Commit 7d5720f2 authored Dec 05, 2018 by lain
--- a/lib/pleroma/user/info.ex
+++ b/lib/pleroma/user/info.ex
@@ -136,7 +136,7 @@ def profile_update(info, params) do
      :no_rich_text,
      :default_scope,
      :banner,
-      :hide_network
+      :hide_network,
      :background
    ])
  end