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

Conflicts:
- Gemfile
- Gemfile.lock
- app/controllers/about_controller.rb
- app/controllers/auth/sessions_controller.rb

2019-09-30 12:23:57 +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

2019-09-30 12:23:57 +02:00

mastodon-light

Add explanation to mute dialog, refactor and clean up mute/block UI (#11992)

2019-09-29 21:46:05 +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

Fix syntax errors in win95 SCSS file

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