9506d9cafc
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 |
||
|---|---|---|
| .. | ||
| _domain_blocks.html.haml | ||
| _login.html.haml | ||
| _registration.html.haml | ||
| more.html.haml | ||
| show.html.haml | ||
| terms.html.haml | ||