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
..
core	Merge branch 'master' into glitch-soc/merge-upstream	2019-09-05 11:36:41 +02:00
flavours	Partially revert scrollbar handling on mobile, since its width-based and wrong	2019-10-06 00:32:06 +02:00
fonts	…
images	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-10 18:59:53 +02:00
locales	…
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	2019-10-10 17:26:08 +02:00
packs	Merge branch 'master' into glitch-soc/merge-upstream	2019-09-30 12:23:57 +02:00
skins	…
styles	Merge branch 'master' into glitch-soc/merge-upstream	2019-10-10 17:26:08 +02:00