Claire 6374937147 Merge commit 'e68b26c8df2056182564abcee230927ed53200c8' into glitch-soc/merge-upstream ... Conflicts: - `app/models/trends/statuses.rb`: Upstream added a date restriction to trendable posts, while glitch-soc had slightly different conditions. Added the date restriction to glitch-soc's conditions.		2024-11-24 16:46:28 +01:00
..
__mocks__	…
entrypoints	Merge commit '77cd16f4ee7ab807df6fffb1538a6659a8182a9e' into glitch-soc/merge-upstream	2024-10-26 13:38:07 +02:00
flavours	Fix collapse icon opening the post (#2899)	2024-11-16 21:39:12 +01:00
fonts	…
hooks	Update directory page options to use URL params (#31977)	2024-09-19 15:34:08 +00:00
icons	…
images	Merge commit '1e71c4e247eb8900a718b04113ffce9c1b8ad2f4' into glitch-soc/merge-upstream	2024-11-10 13:18:43 +01:00
mastodon	Merge commit 'e68b26c8df2056182564abcee230927ed53200c8' into glitch-soc/merge-upstream	2024-11-24 16:46:28 +01:00
material-icons	Merge commit '1e71c4e247eb8900a718b04113ffce9c1b8ad2f4' into glitch-soc/merge-upstream	2024-11-10 13:18:43 +01:00
skins	…
styles	Merge commit '44d92fa4f6aac5c45ad358287af48cd879f5665e' into glitch-soc/merge-upstream	2024-11-15 18:44:32 +01:00
svg-icons	Change zoom icon in web UI (#29683)	2024-09-20 09:42:02 +00:00
types	…