This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.

Thibaut Girka a4c9bda771 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/javascript/styles/mastodon-light.scss config/locales/en.yml config/locales/fr.yml config/locales/simple_form.pl.yml config/themes.yml Conflicts resolved by deleting config/themes.yml, marking app/javascript/styles/mastodon-light.scss as added, and taking all new translation strings, not removing anything from them.		2018-05-21 16:40:02 +02:00
..
contrast	Fix text colors (#7227)	2018-04-22 14:29:40 +02:00
fonts	…
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	2018-05-21 16:40:02 +02:00
application.scss	…
contrast.scss	Separate high contrast theme (#7213)	2018-04-21 21:35:55 +02:00
mailer.scss	…
mastodon-light.scss	Add a light theme (#7027)	2018-05-21 13:40:31 +02:00
win95.scss	…