summaryrefslogtreecommitdiff
path: root/test/fixtures
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2020-09-23 10:49:29 +0000
committerlain <lain@soykaf.club>2020-09-23 10:49:29 +0000
commita5e1c400e49e7979e70f2c9dd4887ae144dca44c (patch)
tree559fe96b7f65cd750a4bab5e9a117c43829c800f /test/fixtures
parent34235bc02a88718b1d5a9d7fa2437784b91bb692 (diff)
parenta6c14041c49df0dc850204723cfc1f242ded8aa2 (diff)
downloadpleroma-a5e1c400e49e7979e70f2c9dd4887ae144dca44c.tar.gz
pleroma-a5e1c400e49e7979e70f2c9dd4887ae144dca44c.zip
Merge branch 'issue/1975' into 'develop'
[#1975] import emoji from a zip archive Closes admin-fe#130 See merge request pleroma/pleroma!2911
Diffstat (limited to 'test/fixtures')
-rw-r--r--test/fixtures/emojis.zipbin0 -> 1446 bytes
-rw-r--r--test/fixtures/empty.zipbin0 -> 22 bytes
2 files changed, 0 insertions, 0 deletions
diff --git a/test/fixtures/emojis.zip b/test/fixtures/emojis.zip
new file mode 100644
index 000000000..d7fc4732b
--- /dev/null
+++ b/test/fixtures/emojis.zip
Binary files differ
diff --git a/test/fixtures/empty.zip b/test/fixtures/empty.zip
new file mode 100644
index 000000000..15cb0ecb3
--- /dev/null
+++ b/test/fixtures/empty.zip
Binary files differ