From: Ivan Tashkinov <ivantashkinov@gmail.com>
Date: Fri, 10 Jan 2020 13:18:32 +0000 (+0300)
Subject: Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-scopes... 
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=39ce894a07cc546092e9c3fcdedabd2b750524c0;p=akkoma

Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-scopes-tweaks

# Conflicts:
#	lib/pleroma/user.ex
---

39ce894a07cc546092e9c3fcdedabd2b750524c0