Merge branch 'develop' into oembed_provider

This commit is contained in:
raeno 2018-12-19 22:39:44 +04:00
commit 7fb3780431
30 changed files with 169 additions and 42 deletions

View file

@ -137,8 +137,8 @@ config :pleroma, :fe,
logo_mask: true,
logo_margin: "0.1em",
background: "/static/aurora_borealis.jpg",
redirect_root_no_login: "/main/all",
redirect_root_login: "/main/friends",
redirect_root_no_login: "/~/main/all",
redirect_root_login: "/~/main/friends",
show_instance_panel: true,
scope_options_enabled: false,
formatting_options_enabled: false,