mirror of https://github.com/Siphonay/mastodon
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_spec.rb | ||
| oembed_controller_spec.rb | ||
| proofs_controller_spec.rb | ||
| push_controller_spec.rb | ||
| salmon_controller_spec.rb | ||
| subscriptions_controller_spec.rb | ||