diff options
| author | Maksim Pechnikov <parallel588@gmail.com> | 2020-02-03 21:42:36 +0300 |
|---|---|---|
| committer | Maksim Pechnikov <parallel588@gmail.com> | 2020-02-03 21:42:36 +0300 |
| commit | 2c40c8b4a2890e60abe8d67a3c8af4a88d225b60 (patch) | |
| tree | be7ff77c4af8b1264c57e8aa8161e80396ca3fbc /test/web/pleroma_api/controllers/emoji_api_controller_test.exs | |
| parent | 21a2a054070c26d7be1a0e453e5f40b20fbd59f2 (diff) | |
| parent | c27d1d65bfd60effdb45359697141c136e156177 (diff) | |
| download | pleroma-2c40c8b4a2890e60abe8d67a3c8af4a88d225b60.tar.gz pleroma-2c40c8b4a2890e60abe8d67a3c8af4a88d225b60.zip | |
Merge branch 'develop' into issue/1383
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( |