mirror of https://github.com/tootsuite/mastodon
e71b16ae2b
Conflicts: - `Gemfile.lock`: glitch-soc-only dependency textually too close to updated upstream dependencies. Updated to upsteam dependencies. |
||
|---|---|---|
| .. | ||
| v1 | ||
| v2 | ||
| web | ||
| base_controller_spec.rb | ||
| oembed_controller_spec.rb | ||
| proofs_controller_spec.rb | ||