Merge branch 'develop' into feature/return-total-for-reports

2019-09-16 14:40:17 +03:00 · 2019-09-16 14:40:17 +03:00 · 219dca1b00
commit 219dca1b00
parent 736165c082 409e701ab8
163 changed files with 6746 additions and 6867 deletions
--- a/docs/api/admin_api.md
+++ b/docs/api/admin_api.md
@ -60,9 +60,13 @@ Authentication is required and the user must be an admin.

 - Method: `POST`
 - Params:
-  - `nickname`
-  - `email`
-  - `password`
+  `users`: [
+    {
+      `nickname`,
+      `email`,
+      `password`
+    }
+  ]
 - Response: User’s nickname

 ## `/api/pleroma/admin/users/follow`