total rebase

[anni] / lib / pleroma / web / mastodon_api / controllers / custom_emoji_controller.ex

diff --git a/lib/pleroma/web/mastodon_api/controllers/custom_emoji_controller.ex b/lib/pleroma/web/mastodon_api/controllers/custom_emoji_controller.ex
old mode 100755 (executable)
new mode 100644 (file)