Merging with develop
authorAlex S <alex.strizhakov@gmail.com>
Wed, 1 May 2019 05:29:33 +0000 (12:29 +0700)
committerAlex S <alex.strizhakov@gmail.com>
Wed, 1 May 2019 05:29:33 +0000 (12:29 +0700)
commitbdfa3a6fa87f95e93aa853ec4961645215f31221
tree467b9dd762c9878541e34f2b38a1c58e387c8f2c
parent97b35e00b049c8f908484163b5ffdbcb55db7867
parent77690b9d03facf74483e3379f72b5b51c9f1bd4e
Merging with develop

Conflicts:
lib/pleroma/web/activity_pub/transmogrifier.ex
lib/pleroma/user.ex
lib/pleroma/user.ex
lib/pleroma/web/activity_pub/relay.ex
lib/pleroma/web/activity_pub/transmogrifier.ex
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
lib/pleroma/web/twitter_api/twitter_api.ex