Merge branch 'feature/new-user-routes' into 'develop'

Use "~" as a route namespace symbol on FE

See merge request pleroma/pleroma!530
This commit is contained in:
lambda 2018-12-18 15:42:07 +00:00
commit 443d59baa0

View File

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