diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2020-02-11 13:54:55 +0400 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2020-02-11 13:54:55 +0400 |
| commit | 6875ccb6bfcc5ae62db26d38c3d5eac4c6f8706a (patch) | |
| tree | dacb02d953473e3a0c6aeec58d86fb7fb1ed5886 /test/web/pleroma_api/controllers/emoji_api_controller_test.exs | |
| parent | 3c4a30c6db312aff2afbfcd423498be19c02c68c (diff) | |
| parent | 5ebffd5224729413e53a55ddda9a1f86224d7d73 (diff) | |
| download | pleroma-6875ccb6bfcc5ae62db26d38c3d5eac4c6f8706a.tar.gz pleroma-6875ccb6bfcc5ae62db26d38c3d5eac4c6f8706a.zip | |
Merge branch 'develop' into feature/new-registrations-digest
Diffstat (limited to 'test/web/pleroma_api/controllers/emoji_api_controller_test.exs')
| -rw-r--r-- | test/web/pleroma_api/controllers/emoji_api_controller_test.exs | 1 |
1 files changed, 0 insertions, 1 deletions
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 8e76f2f3d..6f1ea78ec 100644 --- 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( |