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 bf94a43496 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/oauth/authorized_applications_controller.rb Two changes too close to each other - app/controllers/settings/sessions_controller.rb - app/lib/user_settings_decorator.rb Two changes too close to each other - app/models/media_attachment.rb New changes too close to glitch-soc only changes. - app/models/user.rb Two changes too close to each other. - app/services/remove_status_service.rb Kept direct timeline code which had been removed upstream. - app/views/settings/preferences/show.html.haml Two changes too close to each other. - config/locales/en.yml Introduction of a new string too close to glitch-soc-only's “flavour” - config/locales/ja.yml Introduction of a new string too close to glitch-soc-only's “flavour” - config/locales/pl.yml Introduction of a new string too close to glitch-soc-only's “flavour” - config/locales/simple_form.en.yml Introduction of a new string too close to glitch-soc-only's “skin” - config/locales/simple_form.pl.yml Introduction of a new string too close to glitch-soc-only's “skin” - config/settings.yml Reverted upstream's decision of enabling posting application by default.		5 years ago
..
contrast	Fix link color in high-contrast theme, add underlines (#9949)	5 years ago
fonts	Font styles are now packagified	7 years ago
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
mastodon-light	Improve style of notice/alert messages (#8973)	6 years ago
application.scss	Add new first-time tutorial (#9531)	6 years ago
contrast.scss	Separate high contrast theme (#7213)	6 years ago
mailer.scss	Add moderation warnings (#9519)	6 years ago
mastodon-light.scss	More polished light theme (#7620)	6 years ago
win95.scss	Fix syntax errors in win95 SCSS file	6 years ago