mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-09-12 05:07:06 +00:00
Conflicts: - config/locales/pl.yml Conflict caused by new upstream string too close to glitch-specific “flavour” string. Took both strings. |
||
---|---|---|
.. | ||
activitypub | ||
account_relationships_presenter.rb | ||
initial_state_presenter.rb | ||
instance_presenter.rb | ||
status_relationships_presenter.rb |