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 e5a603206d Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
	app/controllers/accounts_controller.rb
	app/javascript/mastodon/locales/pl.json
	app/views/about/more.html.haml

Conflicts in `accounts_controller.rb` resolved by taking upstream's
version + our `use_pack`.

Conflicts in `pl.json` resolved by taking upstream's changes.

Conflicts in `aboute/more.html.haml` resolved by taking upstream's changes.
8 years ago
..
contrast Fix text colors (#7227) 8 years ago
fonts
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
mastodon-light.scss More polished light theme (#7620) 8 years ago
win95.scss