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 78fa15d08f Merge branch 'master' into glitch-soc/master ... Conflicts: - `streaming/index.js`: Upstream entirely refactored it. Ported our changes to upstream's refactor. Hopefuly.		4 years ago
..
core	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
flavours	[Glitch] Fallback to previous, more approximative hashtag RE on older browsers	4 years ago
fonts	…
images	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
locales	…
mastodon	Merge branch 'master' into glitch-soc/master	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