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 356e9150df Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/lib/sanitize_config.rb Keep our version, we support the tags upstream transforms. - package.json - yarn.lock		5 years ago
..
core	Include necessary JS in auth pages	6 years ago
flavours	Change preferences link in local settings modal from sliders to cog for consistency	5 years ago
fonts	…
images	…
locales	…
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
packs	…
skins	…
styles	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago