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
..
account_finder_concern_spec.rb	Handle nil and blank cases in Account finders (#3500)	2017-06-01 08:20:36 -04:00
account_interactions_spec.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-02-10 21:10:09 +01:00
remotable_spec.rb	Fix attachment not being re-downloaded even if file is not stored (#12125)	2019-10-09 07:10:46 +02:00
status_threading_concern_spec.rb	Record account suspend/silence time and keep track of domain blocks (#10660)	2019-05-14 19:05:02 +02:00