Claire b135b6ba8f Merge commit '8ebc94dd22a18c28c4c9763b909e92e6ba64e242' into glitch-soc/merge-upstream ... Conflicts: - `app/views/admin/custom_emojis/new.html.haml`: Conflict caused by glitch-soc having a different file size limit constant name. Updated like upstream did while keeping glitch-soc's constant name.		2023-12-19 21:24:01 +01:00
..
v1	Merge commit '8ebc94dd22a18c28c4c9763b909e92e6ba64e242' into glitch-soc/merge-upstream	2023-12-19 21:24:01 +01:00
v2	Fix test failure caused by glitch-soc changes	2023-12-19 21:14:39 +01:00
web	Fix embed dropdown menu item for unauthenticated users (#25964)	2023-07-13 15:53:03 +02:00