mirror of
https://github.com/glitch-soc/mastodon.git
synced 2024-11-24 17:14:15 -05:00
f5f6d23d55
Conflicts: - config/locales/pl.yml Conflict caused by new upstream string too close to glitch-specific “flavour” string. Took both strings. |
||
---|---|---|
.. | ||
v1 | ||
v2 | ||
web | ||
base_controller_spec.rb | ||
oembed_controller_spec.rb | ||
proofs_controller_spec.rb | ||
push_controller_spec.rb | ||
salmon_controller_spec.rb | ||
subscriptions_controller_spec.rb |