diff options
| author | lain <lain@soykaf.club> | 2020-09-23 11:49:19 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-09-23 11:49:19 +0000 |
| commit | 436d1a3c41fc92183efffb81cc041ca270025d02 (patch) | |
| tree | a5a8cbe6911ef067c3d38a360897b390f6a855ff /test/fixtures | |
| parent | df1eb5cf7ee6d718a28fca3d3715f11ab0e263cb (diff) | |
| parent | a5e1c400e49e7979e70f2c9dd4887ae144dca44c (diff) | |
| download | pleroma-436d1a3c41fc92183efffb81cc041ca270025d02.tar.gz pleroma-436d1a3c41fc92183efffb81cc041ca270025d02.zip | |
Merge branch 'develop' into 'issue/2115'
# Conflicts:
# CHANGELOG.md
Diffstat (limited to 'test/fixtures')
| -rw-r--r-- | test/fixtures/emojis.zip | bin | 0 -> 1446 bytes |
| -rw-r--r-- | test/fixtures/empty.zip | bin | 0 -> 22 bytes |
2 files changed, 0 insertions, 0 deletions
diff --git a/test/fixtures/emojis.zip b/test/fixtures/emojis.zip Binary files differnew file mode 100644 index 000000000..d7fc4732b --- /dev/null +++ b/test/fixtures/emojis.zip diff --git a/test/fixtures/empty.zip b/test/fixtures/empty.zip Binary files differnew file mode 100644 index 000000000..15cb0ecb3 --- /dev/null +++ b/test/fixtures/empty.zip |