Merge commit 'cfd50f30bb5dda4dd90e1ad01f3e62c99135c36f' into glitch-soc/merge-upstream

2023-07-30 14:33:28 +02:00
parent 5914dfdd69 cfd50f30bb
commit b2515feb29
38 changed files with 121 additions and 94 deletions
--- a/app/views/admin/custom_emojis/index.html.haml
+++ b/app/views/admin/custom_emojis/index.html.haml
@@ -82,4 +82,3 @@
        = render partial: 'custom_emoji', collection: @custom_emojis, locals: { f: f }

 = paginate @custom_emojis
-