From: Ivan Tashkinov <ivantashkinov@gmail.com>
Date: Wed, 4 Dec 2019 15:56:31 +0000 (+0300)
Subject: Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields... 
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=30caf3e51e32830153e693727b3765e8817171a3;p=akkoma

Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations

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

30caf3e51e32830153e693727b3765e8817171a3