Merge branch 'develop' into test/activity_pub/transmogrifier.ex
authorMaksim Pechnikov <parallel588@gmail.com>
Thu, 19 Sep 2019 04:35:34 +0000 (07:35 +0300)
committerMaksim Pechnikov <parallel588@gmail.com>
Thu, 19 Sep 2019 04:35:34 +0000 (07:35 +0300)
commitd4ed3a35b8aa34cd968113970bbab445eb251703
treedbbf93e12e33932d7774ab72fb54ff0ee08031d1
parent2b40e57a72f3ee3209b204a5ae5e0221b1d66c7e
parentf95a2b2cda236f7c0e5ced2a4698e2b10d99fa53
Merge branch 'develop' into test/activity_pub/transmogrifier.ex
lib/pleroma/object/fetcher.ex
lib/pleroma/web/activity_pub/transmogrifier.ex
lib/pleroma/web/activity_pub/views/user_view.ex
test/web/activity_pub/transmogrifier_test.exs
test/web/activity_pub/views/user_view_test.exs