Merge branch 'develop' into test/activity_pub/transmogrifier.ex
authorMaksim Pechnikov <parallel588@gmail.com>
Mon, 23 Sep 2019 18:32:50 +0000 (21:32 +0300)
committerMaksim Pechnikov <parallel588@gmail.com>
Mon, 23 Sep 2019 18:32:50 +0000 (21:32 +0300)
commit38245f13367cdc2df29ff2a499418e526b654fb5
tree514724023f061f56e42fcaa7ae79f07d3d055c58
parentd4ed3a35b8aa34cd968113970bbab445eb251703
parentfd48bd80eb7eab563c25586b1deba2ed42c02c5a
Merge branch 'develop' into test/activity_pub/transmogrifier.ex
lib/pleroma/web/activity_pub/views/user_view.ex
test/web/activity_pub/views/user_view_test.exs