You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
mastodon/app/javascript/styles
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”.
8 years ago
..
contrast Fix text colors (#7227) 8 years ago
fonts Font styles are now packagified 8 years ago
mastodon Merge branch 'master' into glitch-soc/merge-upstream 8 years ago
mastodon-light Revert "Fix dark background error on user-mention autosuggest (#7937)" (#7964) 8 years ago
application.scss Redesign public profiles and toots (#8068) 8 years ago
contrast.scss Separate high contrast theme (#7213) 8 years ago
mailer.scss Improve HTML e-mails based on Litmus tests (#6301) 8 years ago
mastodon-light.scss More polished light theme (#7620) 8 years ago
win95.scss Strip trailing whitespace on win95.scss 8 years ago