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 c1c514ca70 Merge branch 'master' into glitch-soc/merge-upstream ... Manually-resolved conflicts: .circleci/config.yml app/controllers/accounts_controller.rb app/controllers/auth/passwords_controller.rb app/controllers/statuses_controller.rb app/javascript/packs/public.js app/models/media_attachment.rb app/views/stream_entries/_content_spoiler.html.haml app/views/stream_entries/_media.html.haml config/locales/en.yml config/locales/ja.yml config/locales/pl.yml lib/mastodon/version.rb Some content from app/javascript/packs/public.js has been split to app/javascript/core/settings.js. Translation strings for glitch-soc's keyword mutes were dropped. Everything else was mostly “take both”.		6 years ago
..
contrast	Fix text colors (#7227)	7 years ago
fonts	Font styles are now packagified	7 years ago
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
mastodon-light	Revert "Fix dark background error on user-mention autosuggest (#7937)" (#7964)	6 years ago
application.scss	Redesign public profiles and toots (#8068)	6 years ago
contrast.scss	Separate high contrast theme (#7213)	7 years ago
mailer.scss	Improve HTML e-mails based on Litmus tests (#6301)	7 years ago
mastodon-light.scss	More polished light theme (#7620)	7 years ago
win95.scss	Strip trailing whitespace on win95.scss	7 years ago