You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Claire 92c06a1113 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/admin/base_controller.rb`: Minor conflict caused by glitch-soc's theming system. - `app/javascript/mastodon/initial_state.js`: Minor conflict caused by glitch-soc making use of max_toot_chars. - `app/models/form/admin_settings.rb`: Minor conflict caused by glitch-soc's theming system. - `app/models/trends.rb`: Minor conflict caused by glitch-soc having more granular notification settings for trends. - `app/views/admin/accounts/index.html.haml`: Minor conflict caused by glitch-soc's theming system. - `app/views/admin/instances/show.html.haml`: Minor conflict caused by glitch-soc's theming system. - `app/views/layouts/application.html.haml`: Minor conflict caused by glitch-soc's theming system. - `app/views/settings/preferences/notifications/show.html.haml`: Minor conflict caused by glitch-soc having more granular notification settings for trends. - `config/navigation.rb`: Minor conflict caused by glitch-soc having additional navigation items for the theming system while upstream slightly changed every line.		2 years ago
..
contrast	Fix contrast of some elements with new brand colors (#18691)	2 years ago
fonts	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
mastodon	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
mastodon-light	Fix contrast of some elements with new brand colors (#18691)	2 years ago
application.scss	Change brand color and logotypes (#18592)	2 years ago
contrast.scss	Separate high contrast theme (#7213)	7 years ago
mailer.scss	Remove sign-in token authentication, instead send e-mail about new sign-in (#17970)	3 years ago
mastodon-light.scss	More polished light theme (#7620)	7 years ago
win95.scss	Update win95 style from cybre.space	3 years ago