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 20d01a954e Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/settings/preferences_controller.rb - app/lib/user_settings_decorator.rb - app/models/user.rb Conflicts due to the addition of a new preference upstream, “advanced layout”.		2019-05-26 15:41:40 +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-26 15:41:40 +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	…
mailer.scss	…
mastodon-light.scss	…
win95.scss	…