390fd84e20
Merge branch 'main' of https://github.com/glitch-soc/mastodon into fork
c5751f8377
Merge pull request #1643 from ClearlyClaire/glitch-soc/merge-upstream
5bf3a09c5b
Merge branch 'main' into glitch-soc/merge-upstream
a458b74c7e
Fix error on trending mailer due to missing constant (#17072)
f200775fde
Bump @babel/plugin-transform-runtime from 7.16.0 to 7.16.4 (#17023)
70b7ac9ff3
Merge pull request #1583 from ClearlyClaire/glitch-soc/merge-upstream
8681ef85d0
[Glitch] Fix logout link not working in safari
8d55cb7d71
[Glitch] Fix trends layout
76c7226eb0
Fix account statuses cleanup settings controller for glitch-soc's theming system
8ec4be4233
Merge branch 'main' into glitch-soc/merge-upstream