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 45deca65b3 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/packs/public.js`: Conflict because part of that file has been split to `app/javascript/core/settings.js`. Ported those changes there.		4 years ago
..
core	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
flavours	…
fonts	…
images	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
locales	…
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
packs	Fix lock icon not being shown when locking account in profile settings (#14190)	4 years ago
skins	…
styles	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago