1
0
mirror of https://github.com/misskey-dev/misskey.git synced 2026-05-02 13:16:08 +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

@@ -20,7 +20,7 @@ module.exports = async (params) => new Promise(async (res, rej) => {
const exist = await User
.count({
host: null,
username_lower: username.toLowerCase()
usernameLower: username.toLowerCase()
}, {
limit: 1
});