mirror of https://github.com/tootsuite/mastodon
61631f4751
Conflicts: - README.md - app/javascript/styles/mastodon/components.scss conflicts caused by image URLs being different - app/models/status.rb as_home_timeline removed, kept glitch-soc-only as_direct_timeline - app/views/statuses/_simple_status.html.haml - config/locales/en.yml some strings were changed upstream - spec/models/status_spec.rb as_home_timeline removed, kept glitch-soc-only as_direct_timeline |
||
|---|---|---|
| .. | ||
| account_finder_concern_spec.rb | ||
| account_interactions_spec.rb | ||
| remotable_spec.rb | ||
| status_threading_concern_spec.rb | ||