# Conflicts: # lib/pleroma/web/activity_pub/transmogrifier.ex # test/pleroma/web/activity_pub/transmogrifier/note_handling_test.exs |
||
|---|---|---|
| .. | ||
| mix | ||
| phoenix/transports/web_socket | ||
| pleroma | ||
# Conflicts: # lib/pleroma/web/activity_pub/transmogrifier.ex # test/pleroma/web/activity_pub/transmogrifier/note_handling_test.exs |
||
|---|---|---|
| .. | ||
| mix | ||
| phoenix/transports/web_socket | ||
| pleroma | ||