Merge branch 'fix-alphasort' into 'develop'

Alpha sort the restricted nicknames

See merge request pleroma/pleroma!650
This commit is contained in:
kaniini 2019-01-10 01:08:33 +00:00
commit be92edcb29
1 changed files with 24 additions and 24 deletions

View File

@ -237,34 +237,34 @@
config :pleroma, Pleroma.User, config :pleroma, Pleroma.User,
restricted_nicknames: [ restricted_nicknames: [
"about",
"~",
"main",
"users",
"settings",
"objects",
"activities",
"web",
"registration",
"friend-requests",
"pleroma",
"api",
"tag",
"notice",
"status",
"user-search",
"ostatus_subscribe",
"oauth",
"push",
"relay",
"inbox",
".well-known", ".well-known",
"nodeinfo", "~",
"about",
"activities",
"api",
"auth", "auth",
"proxy",
"dev", "dev",
"friend-requests",
"inbox",
"internal", "internal",
"media" "main",
"media",
"nodeinfo",
"notice",
"oauth",
"objects",
"ostatus_subscribe",
"pleroma",
"proxy",
"push",
"registration",
"relay",
"settings",
"status",
"tag",
"user-search",
"users",
"web"
] ]
config :pleroma, Pleroma.Web.Federator, max_jobs: 50 config :pleroma, Pleroma.Web.Federator, max_jobs: 50