mirror of
https://github.com/mastodon/mastodon.git
synced 2024-11-28 07:57:45 +00:00
b9f314bba7
Conflicts: - config/locales/es.yml - config/locales/pl.yml - config/locales/pt-BR.yml |
||
---|---|---|
.. | ||
activitypub | ||
account_relationships_presenter.rb | ||
initial_state_presenter.rb | ||
instance_presenter.rb | ||
status_relationships_presenter.rb |