Merge branch 'develop' into oembed_provider
This commit is contained in:
commit
7fb3780431
30 changed files with 169 additions and 42 deletions
|
|
@ -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,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue