Thibaut Girka 9506d9cafc 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
..
_custom_emoji.html.haml	Fix not showing if emoji has a local counterpart in admin UI (#12135)	2019-10-10 02:21:52 +02:00
index.html.haml	Fix upstream changes breaking because of glitch-soc's theming engine	2019-09-13 20:28:22 +02:00
new.html.haml	Redesign forms, verify link ownership with rel="me" (#8703)	2018-09-18 16:45:58 +02:00