You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Thibaut Girka c790ecb14d Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/api/v1/statuses_controller.rb`: Conflict due to upstream adding a new parameter (with_rate_limit), too close to glitch-soc's own additional parameter (content_type). Added upstream's parameter. - `app/services/post_status_service.rb`: Conflict due to upstream adding a new parameter (rate_limit), too close to glitch-soc's own additional parameter (content_type). Added upstream's parameter. - `app/views/settings/preferences/appearance/show.html.haml`: Conflict due to us not exposing theme settings here (as we have a different flavour/skin menu). Took upstream change, while still not exposing theme settings. - `config/webpack/shared.js`: Coding style fixes for a part we have rewritten. Discarded upstream changes.		4 years ago
..
contrast	Fix sass-lint config (#10982)	5 years ago
fonts	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
mastodon-light	Fix media editing modal and profile directory in light theme (#12059)	5 years ago
application.scss	Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` (#11247)	5 years ago
contrast.scss	Separate high contrast theme (#7213)	6 years ago
mailer.scss	Add option to include reported statuses in warning e-mail (#11639)	5 years ago
mastodon-light.scss	More polished light theme (#7620)	6 years ago
win95.scss	Fix syntax errors in win95 SCSS file	6 years ago