Thibaut Girka 59e92004b3 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- `Gemfile.lock`: not a real conflict, upstream update too close
  to a glitch-soc-specific dependency

2020-06-17 17:10:15 +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

2020-06-17 17:10:15 +02:00

mastodon-light

Improve rendering of emoji which do not contrast with background (#13772)

2020-06-09 10:28:23 +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

…