a11a7176d5
# Conflicts: # lib/pleroma/user/info.ex # lib/pleroma/web/activity_pub/activity_pub.ex # lib/pleroma/web/activity_pub/transmogrifier.ex |
||
---|---|---|
.. | ||
object_view.ex | ||
user_view.ex |
a11a7176d5
# Conflicts: # lib/pleroma/user/info.ex # lib/pleroma/web/activity_pub/activity_pub.ex # lib/pleroma/web/activity_pub/transmogrifier.ex |
||
---|---|---|
.. | ||
object_view.ex | ||
user_view.ex |