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

…

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

…

contrast.scss

…

mailer.scss

…

mastodon-light.scss

…

win95.scss

…