diff options
| author | Tusooa Zhu <tusooa@kazv.moe> | 2022-07-03 22:24:57 +0000 |
|---|---|---|
| committer | Tusooa Zhu <tusooa@kazv.moe> | 2022-07-03 22:24:57 +0000 |
| commit | 4edc867b87362475a8cd749257e5d29c431467b4 (patch) | |
| tree | 8805651d07c82f48c2935dcdf598016045a1813d /test/fixtures | |
| parent | 014096aeefe88348323db74e2ab7f81e0184bfee (diff) | |
| parent | c50ade26ba9f63802512a745107de66aba59e9fe (diff) | |
| download | pleroma-4edc867b87362475a8cd749257e5d29c431467b4.tar.gz pleroma-4edc867b87362475a8cd749257e5d29c431467b4.zip | |
Merge branch 'develop' into 'from/upstream-develop/tusooa/edits'
# Conflicts:
# lib/pleroma/constants.ex
Diffstat (limited to 'test/fixtures')
| -rw-r--r-- | test/fixtures/image_with_caption-abstract.jpg | bin | 0 -> 697 bytes |
| -rw-r--r-- | test/fixtures/image_with_imagedescription_and_caption-abstract.jpg | bin | 0 -> 823 bytes |
| -rw-r--r-- | test/fixtures/image_with_imagedescription_and_caption-abstract_whitespaces.jpg | bin | 0 -> 785 bytes |
| -rw-r--r-- | test/fixtures/image_with_no_description.jpg | bin | 0 -> 631 bytes |
4 files changed, 0 insertions, 0 deletions
diff --git a/test/fixtures/image_with_caption-abstract.jpg b/test/fixtures/image_with_caption-abstract.jpg Binary files differnew file mode 100644 index 000000000..f982ffa81 --- /dev/null +++ b/test/fixtures/image_with_caption-abstract.jpg diff --git a/test/fixtures/image_with_imagedescription_and_caption-abstract.jpg b/test/fixtures/image_with_imagedescription_and_caption-abstract.jpg Binary files differnew file mode 100644 index 000000000..c82a269ef --- /dev/null +++ b/test/fixtures/image_with_imagedescription_and_caption-abstract.jpg diff --git a/test/fixtures/image_with_imagedescription_and_caption-abstract_whitespaces.jpg b/test/fixtures/image_with_imagedescription_and_caption-abstract_whitespaces.jpg Binary files differnew file mode 100644 index 000000000..a232fd2a1 --- /dev/null +++ b/test/fixtures/image_with_imagedescription_and_caption-abstract_whitespaces.jpg diff --git a/test/fixtures/image_with_no_description.jpg b/test/fixtures/image_with_no_description.jpg Binary files differnew file mode 100644 index 000000000..ec6fc4be8 --- /dev/null +++ b/test/fixtures/image_with_no_description.jpg |
