Resolve conflicts
This commit is contained in:
parent
281b388e39
commit
bfc193d8cd
308 changed files with 3045 additions and 3200 deletions
|
|
@ -15,10 +15,10 @@ import User from '../models/user';
|
|||
* schema:
|
||||
* type: object
|
||||
* properties:
|
||||
* posts_count:
|
||||
* postsCount:
|
||||
* description: count of all posts of misskey
|
||||
* type: number
|
||||
* users_count:
|
||||
* usersCount:
|
||||
* description: count of all users of misskey
|
||||
* type: number
|
||||
*
|
||||
|
|
@ -42,7 +42,7 @@ module.exports = params => new Promise(async (res, rej) => {
|
|||
.count();
|
||||
|
||||
res({
|
||||
posts_count: postsCount,
|
||||
users_count: usersCount
|
||||
postsCount: postsCount,
|
||||
usersCount: usersCount
|
||||
});
|
||||
});
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue