projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'support/issue_480' into 'develop'
[akkoma]
/
config
/
config.exs
diff --git
a/config/config.exs
b/config/config.exs
index 980c215c818a12a6109d197ff48f525d28cf06e4..1983b31ab86ecd3b0f90706765663e6f252bdfbc 100644
(file)
--- a/
config/config.exs
+++ b/
config/config.exs
@@
-137,8
+137,8
@@
config :pleroma, :fe,
logo_mask: true,
logo_margin: "0.1em",
background: "/static/aurora_borealis.jpg",
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,
show_instance_panel: true,
scope_options_enabled: false,
formatting_options_enabled: false,
@@
-222,6
+222,8
@@
config :cors_plug,
config :pleroma, Pleroma.User,
restricted_nicknames: [
config :pleroma, Pleroma.User,
restricted_nicknames: [
+ "about",
+ "~",
"main",
"users",
"settings",
"main",
"users",
"settings",