Fix merge.

2018-12-05 21:31:02 +01:00 · 2018-12-05 21:31:02 +01:00 · 7d5720f2e4
commit 7d5720f2e4
parent 76d6b1c6ab
1 changed files with 1 additions and 1 deletions
--- 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