mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-15 15:44:56 +01:00
f5f6d23d55
Conflicts: - config/locales/pl.yml Conflict caused by new upstream string too close to glitch-specific “flavour” string. Took both strings. |
||
---|---|---|
.. | ||
credentials_controller_spec.rb | ||
follower_accounts_controller_spec.rb | ||
following_accounts_controller_spec.rb | ||
lists_controller_spec.rb | ||
pins_controller_spec.rb | ||
relationships_controller_spec.rb | ||
search_controller_spec.rb | ||
statuses_controller_spec.rb |