bdfa3a6fa8
Conflicts: lib/pleroma/web/activity_pub/transmogrifier.ex lib/pleroma/user.ex |
||
---|---|---|
.. | ||
mrf | ||
views | ||
activity_pub.ex | ||
activity_pub_controller.ex | ||
mrf.ex | ||
relay.ex | ||
transmogrifier.ex | ||
utils.ex | ||
visibility.ex |
bdfa3a6fa8
Conflicts: lib/pleroma/web/activity_pub/transmogrifier.ex lib/pleroma/user.ex |
||
---|---|---|
.. | ||
mrf | ||
views | ||
activity_pub.ex | ||
activity_pub_controller.ex | ||
mrf.ex | ||
relay.ex | ||
transmogrifier.ex | ||
utils.ex | ||
visibility.ex |