Merge branch 'develop' into 'fix/admin-api-user-deletion'
authorMaxim Filippov <colixer@gmail.com>
Wed, 14 Aug 2019 22:45:32 +0000 (22:45 +0000)
committerMaxim Filippov <colixer@gmail.com>
Wed, 14 Aug 2019 22:45:32 +0000 (22:45 +0000)
commitec969eec5149c5fe2a3e676ea07384b4597487f1
treeb725022b93c7f354116e50d54009e0dc5dc19eaf
parentb27fafe161241c954b713281bebd6ffe1e990884
parent27b747546a7796de57e88f454b2c2810c7523f97
Merge branch 'develop' into 'fix/admin-api-user-deletion'

# Conflicts:
#   CHANGELOG.md
CHANGELOG.md
lib/pleroma/web/activity_pub/activity_pub.ex
test/user_test.exs