Merge branch 'fix-alphasort' into 'develop'

Alpha sort the restricted nicknames

See merge request pleroma/pleroma!650

config/config.exs

@@ -237,34 +237,34 @@ config :cors_plug,
 
 config :pleroma, Pleroma.User,
   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",
-    "nodeinfo",
+    "~",
+    "about",
+    "activities",
+    "api",
     "auth",
-    "proxy",
     "dev",
+    "friend-requests",
+    "inbox",
     "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