Thibaut Girka 9adeaf2bfc Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- `app/controllers/statuses_controller.rb`:
  Minor conflict due to theming system

2020-01-24 14:37:06 +01:00

..

contrast

Fix sass-lint config (#10982)

2019-06-06 18:51:46 +02:00

fonts

…

mastodon

Merge branch 'master' into glitch-soc/merge-upstream

2020-01-24 14:37:06 +01: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

…

mailer.scss

Add option to include reported statuses in warning e-mail (#11639)

2019-08-23 22:37:23 +02:00

mastodon-light.scss

…

win95.scss

…