Claire e855df149b Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.env.production.sample`: Upstream added new configuration options, uncommented by default. Commented them. - `Gemfile.lock`: Upstream updated dependencies textually close to glitch-soc-specific dependencies. Updated those upstream dependencies.		2021-10-25 20:28:51 +02:00
..
contrast
fonts
mastodon
mastodon-light
application.scss
contrast.scss
mailer.scss
mastodon-light.scss
win95.scss