1
0
mirror of https://github.com/misskey-dev/misskey.git synced 2026-05-02 20:15:55 +02:00

Resolve conflicts

This commit is contained in:
syuilo
2018-03-29 14:48:47 +09:00
parent 281b388e39
commit bfc193d8cd
308 changed files with 3045 additions and 3200 deletions

View File

@@ -26,7 +26,7 @@ module.exports = (params, me) => new Promise(async (res, rej) => {
const users = await User
.find({
username_lower: new RegExp(query.toLowerCase())
usernameLower: new RegExp(query.toLowerCase())
}, {
limit: limit,
skip: offset