projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'emoji-api-errors' into 'develop'
[akkoma]
/
test
/
web
/
pleroma_api
/
controllers
/
emoji_api_controller_test.exs
diff --git
a/test/web/pleroma_api/controllers/emoji_api_controller_test.exs
b/test/web/pleroma_api/controllers/emoji_api_controller_test.exs
index 8e76f2f3dbc5cff90a3102b2ee11136b57ba1218..6f1ea78eced1631c1f74be53ab6ad5950fb799d1 100644
(file)
--- a/
test/web/pleroma_api/controllers/emoji_api_controller_test.exs
+++ b/
test/web/pleroma_api/controllers/emoji_api_controller_test.exs
@@
-6,7
+6,6
@@
defmodule Pleroma.Web.PleromaAPI.EmojiAPIControllerTest do
use Pleroma.Web.ConnCase
import Tesla.Mock
-
import Pleroma.Factory
@emoji_dir_path Path.join(