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 e7f1bfdc2d Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/javascript/packs/public.js - app/models/user.rb - config/settings.yml - db/schema.rb Moved public.js changes to settings.js.		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	…
win95.scss	…