mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-13 08:55:40 +00:00
1d6152f440
Conflicts: - config/locales/en.yml Conflict caused by the glitch-soc-specific “flavour” string being too close to the newly introduced “identity_proofs” string. Just included both. |
||
---|---|---|
.. | ||
v1 | ||
v2 | ||
web | ||
base_controller.rb | ||
oembed_controller.rb | ||
proofs_controller.rb | ||
push_controller.rb | ||
salmon_controller.rb | ||
subscriptions_controller.rb |