diff options
author | lain <lain@soykaf.club> | 2018-12-05 21:31:02 +0100 |
---|---|---|
committer | lain <lain@soykaf.club> | 2018-12-05 21:31:02 +0100 |
commit | 7d5720f2e40015502fe646b86768ab8454f571fe (patch) | |
tree | 5c2932200859525b8e245f671b0cdc25ca56bfd4 /lib | |
parent | 76d6b1c6ab2813b1fb8f4473e4d722cc32fb2fed (diff) | |
download | pleroma-7d5720f2e40015502fe646b86768ab8454f571fe.tar.gz |
Fix merge.
Diffstat (limited to 'lib')
-rw-r--r-- | lib/pleroma/user/info.ex | 2 |
1 files changed, 1 insertions, 1 deletions
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 |