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.

Thibaut Girka 65e994b29b Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/directories_controller.rb - app/controllers/settings/applications_controller.rb - app/controllers/settings/base_controller.rb - app/controllers/settings/deletes_controller.rb - app/controllers/settings/exports_controller.rb - app/controllers/settings/follower_domains_controller.rb - app/controllers/settings/imports_controller.rb - app/controllers/settings/migrations_controller.rb - app/controllers/settings/notifications_controller.rb - app/controllers/settings/preferences_controller.rb - app/controllers/settings/sessions_controller.rb - app/controllers/settings/two_factor_authentication/confirmations_controller.rb - app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb - app/controllers/settings/two_factor_authentications_controller.rb Conflicts were due to some refactoring already made in glitch-soc when introducing flavours.		6 years ago
..
contrast	…
fonts	…
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
mastodon-light	Improve style of notice/alert messages (#8973)	6 years ago
application.scss	Redesign public profiles and toots (#8068)	6 years ago
contrast.scss	…
mailer.scss	Separate font-family into variable (#8763)	6 years ago
mastodon-light.scss	More polished light theme (#7620)	7 years ago
win95.scss	…