Claire fc205f34a1 Merge branch 'main' into glitch-soc/merge-upstream		2022-03-14 16:44:35 +01:00
..
_custom_emoji.html.haml	Add trending statuses (#17431)	2022-02-25 00:34:14 +01:00
index.html.haml	Add subresource integrity for JS and CSS assets (#15096)	2020-11-06 11:56:31 +01:00
new.html.haml	Fix not being able to upload GIF emojis in admin UI (#17759)	2022-03-14 05:45:22 +01:00