mirror of
https://github.com/jtomchak/akkoma.git
synced 2025-01-31 20:09:08 +01:00
bdfa3a6fa8
Conflicts: lib/pleroma/web/activity_pub/transmogrifier.ex lib/pleroma/user.ex |
||
---|---|---|
.. | ||
views | ||
mastodon_api.ex | ||
mastodon_api_controller.ex | ||
subscription_controller.ex | ||
websocket_handler.ex |