Merge branch 'develop' into command-available-check

2020-08-05 19:16:48 +03:00 · 2020-08-05 19:16:48 +03:00 · 4672b61106
commit 4672b61106
parent 3116a75e80 7755f49e28
355 changed files with 5613 additions and 3738 deletions
--- a/test/upload/filter/anonymize_filename_test.exs
+++ b/test/upload/filter/anonymize_filename_test.exs
@ -9,6 +9,8 @@ defmodule Pleroma.Upload.Filter.AnonymizeFilenameTest do
  alias Pleroma.Upload

  setup do
+    File.cp!("test/fixtures/image.jpg", "test/fixtures/image_tmp.jpg")
+
    upload_file = %Upload{
      name: "an… image.jpg",
      content_type: "image/jpg",