Merge branch 'develop' into feature/bulk-confirmation
authorMark Felder <feld@FreeBSD.org>
Wed, 23 Sep 2020 16:56:22 +0000 (11:56 -0500)
committerMark Felder <feld@FreeBSD.org>
Wed, 23 Sep 2020 16:56:22 +0000 (11:56 -0500)
commitf3a1f9c3bbb7321876a09b3846b5e10ecf4af94f
treebcfd29188a841470cdeca478b1c5a3bbd4cc930a
parent34d7e864db8f9cc7fb73ce2fef8466ce8e09ed85
parente02101e15c425416975f756aca7f3b058006668d
Merge branch 'develop' into feature/bulk-confirmation
CHANGELOG.md
lib/mix/tasks/pleroma/user.ex
lib/pleroma/user.ex
lib/pleroma/user/query.ex