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
..
contrast	Fix sass-lint config (#10982)	2019-06-06 18:51:46 +02:00
fonts	Merge branch 'master' into glitch-soc/merge-upstream	2019-04-22 20:40:04 +02:00
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	2019-10-10 17:26:08 +02:00
mastodon-light	Fix media editing modal and profile directory in light theme (#12059)	2019-10-03 03:17:29 +02:00
application.scss	Remove Atom feeds and old URLs in the form of GET /:username/updates/:id (#11247)	2019-07-07 16:16:51 +02:00
contrast.scss	Separate high contrast theme (#7213)	2018-04-21 21:35:55 +02:00
mailer.scss	Add option to include reported statuses in warning e-mail (#11639)	2019-08-23 22:37:23 +02:00
mastodon-light.scss	More polished light theme (#7620)	2018-05-25 18:36:26 +02:00
win95.scss	Fix syntax errors in win95 SCSS file	2019-01-02 15:36:59 +01:00