fixes after rebase
authorAlexander Strizhakov <alex.strizhakov@gmail.com>
Thu, 24 Sep 2020 06:42:30 +0000 (09:42 +0300)
committerAlexander Strizhakov <alex.strizhakov@gmail.com>
Thu, 24 Sep 2020 06:42:30 +0000 (09:42 +0300)
commit5d7ec00bedc61e8899941c374604ae5854c62f4c
tree71d56379939f5ffc4fd2af4971de28fe7df5ae52
parent871fac3e4c9d8b1a138204ac754b2a9633bd9eaa
fixes after rebase
lib/pleroma/web/api_spec/operations/pleroma_emoji_file_operation.ex
lib/pleroma/web/router.ex
test/utils_test.exs
test/web/pleroma_api/controllers/emoji_file_controller_test.exs