Thibaut Girka 76918554a6 Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream ...

Conflicts:
- Gemfile.lock
- config/webpack/rules/css.js
- package.json
- yarn.lock

2019-06-03 14:54:30 +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 remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream

2019-06-03 14:54:30 +02:00

mastodon-light

Use <use /> to render transparent SVG logo instead of inserting it (#10845)

2019-05-27 03:33:39 +02:00

application.scss

Add polls (#10111)

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

contrast.scss

…

mailer.scss

Add moderation warnings (#9519)

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

mastodon-light.scss

…

win95.scss

Fix syntax errors in win95 SCSS file

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