Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields...
authorIvan Tashkinov <ivantashkinov@gmail.com>
Tue, 26 Nov 2019 07:42:36 +0000 (10:42 +0300)
committerIvan Tashkinov <ivantashkinov@gmail.com>
Tue, 26 Nov 2019 07:42:36 +0000 (10:42 +0300)
commitc8d3c3bfeca66d16846f97b50328e0718cfe5fef
treecfe7074c79f6117443632af5f13fd33672f90732
parentcad9b325e567c9c607c2b1d33c915cc88da716b1
parentdc9090810dbed74da91f2e94f23e5512d259e4fc
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations

# Conflicts:
# lib/pleroma/web/activity_pub/activity_pub.ex
CHANGELOG.md
lib/pleroma/user.ex
lib/pleroma/web/activity_pub/activity_pub.ex