diff options
| author | lain <lain@soykaf.club> | 2020-06-23 10:17:12 +0200 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-06-23 10:17:12 +0200 |
| commit | 2c603f20098d7f342e1cbad8e6a6c86b007c5a99 (patch) | |
| tree | dd9a339daed6a25e758167413d9231e22ce42ac4 /test/instance_static/emoji/test_pack | |
| parent | b05f795326b77edd881ffea2c004d7ca0ddd7df9 (diff) | |
| parent | 3875a507d4b52df7edbda376d3ed31ad52241ac5 (diff) | |
| download | pleroma-2c603f20098d7f342e1cbad8e6a6c86b007c5a99.tar.gz pleroma-2c603f20098d7f342e1cbad8e6a6c86b007c5a99.zip | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update-validator
Diffstat (limited to 'test/instance_static/emoji/test_pack')
| -rw-r--r-- | test/instance_static/emoji/test_pack/blank2.png | bin | 0 -> 95 bytes | |||
| -rw-r--r-- | test/instance_static/emoji/test_pack/pack.json | 3 |
2 files changed, 2 insertions, 1 deletions
diff --git a/test/instance_static/emoji/test_pack/blank2.png b/test/instance_static/emoji/test_pack/blank2.png Binary files differnew file mode 100644 index 000000000..8f50fa023 --- /dev/null +++ b/test/instance_static/emoji/test_pack/blank2.png diff --git a/test/instance_static/emoji/test_pack/pack.json b/test/instance_static/emoji/test_pack/pack.json index 481891b08..5b33fbb32 100644 --- a/test/instance_static/emoji/test_pack/pack.json +++ b/test/instance_static/emoji/test_pack/pack.json @@ -1,6 +1,7 @@ { "files": { - "blank": "blank.png" + "blank": "blank.png", + "blank2": "blank2.png" }, "pack": { "description": "Test description", |
