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

Conflicts:
- streaming/index.js

2019-05-24 15:23:52 +02:00

..

contrast

Fix some colors of high contrast theme (#10711)

2019-05-07 23:53:58 +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

2019-05-24 15:23:52 +02:00

mastodon-light

Fix some colors in light theme (#10754)

2019-05-12 05:15:42 +02:00

application.scss

Add polls (#10111)

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

contrast.scss

Separate high contrast theme (#7213)

2018-04-21 21:35:55 +02:00

mailer.scss

Add moderation warnings (#9519)

2018-12-22 20:02:09 +01:00

mastodon-light.scss

More polished light theme (#7620)

2018-05-25 18:36:26 +02:00

win95.scss

Fix syntax errors in win95 SCSS file

2019-01-02 15:36:59 +01:00