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

Conflicts:
- app/models/media_attachment.rb

2019-05-04 16:37:26 +02:00

..

contrast

Fix color of static page links in high contrast theme (#10028)

2019-02-13 05:30:49 +01: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

2019-05-04 16:37:26 +02:00

mastodon-light

Disable box shadows for featured hashtags in light theme (#10034)

2019-02-13 18:33:03 +01:00

application.scss

Add polls (#10111)

2019-03-03 22:18:23 +01:00

contrast.scss

…

mailer.scss

…

mastodon-light.scss

…

win95.scss

…