This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.

Thibaut Girka 61631f4751 Merge branch 'master' into glitch-soc/merge-upstream ... 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		2019-10-10 17:26:08 +02:00
..
_domain_blocks.html.haml	…
_login.html.haml	…
_registration.html.haml	…
more.html.haml	…
show.html.haml	Remove fallback to long description on sidebar and meta description (#12119)	2019-10-08 22:08:55 +02:00
terms.html.haml	…