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
..
_custom_emoji.html.haml	Fix haml-lint UnnecessaryStringOutput for views (#27531)	2023-10-25 12:01:00 +00:00
index.html.haml	Consolidate inclusion of admin js pack link (#26628)	2023-08-24 09:56:23 +02:00
new.html.haml	Merge commit '8ebc94dd22a18c28c4c9763b909e92e6ba64e242' into glitch-soc/merge-upstream	2023-12-19 21:24:01 +01:00