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

Conflicts:
- `Gemfile.lock`:
  glitch-soc-only dependency textually too close to updated upstream
  dependencies. Updated to upsteam dependencies.

2020-11-25 15:31:45 +01:00

..

contrast

Fix unreadable placeholder text color in high contrast theme in web UI (#14803)

2020-09-15 09:24:24 +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-11-25 15:31:45 +01:00

mastodon-light

Add duration parameter to muting. (#13831)

2020-10-13 01:01:14 +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

…