mirror of
https://git.pleroma.social/pleroma/pleroma.git
synced 2025-01-22 23:18:19 +00:00
3fa51f7272
# Conflicts: # lib/pleroma/web/mastodon_api/views/account_view.ex # lib/pleroma/web/mastodon_api/views/status_view.ex |
||
---|---|---|
.. | ||
mix | ||
pleroma | ||
jason_types.ex | ||
transports.ex | ||
xml_builder.ex |