diff options
| author | Mark Felder <feld@FreeBSD.org> | 2020-06-25 14:16:28 -0500 |
|---|---|---|
| committer | Mark Felder <feld@FreeBSD.org> | 2020-06-25 14:26:21 -0500 |
| commit | 433c01b370f4bf68d3f016d86c1527b1319e7a0c (patch) | |
| tree | 607d6c7e4e578d6e0ff95963b5565baefc207d85 /test/instance_static/emoji/test_pack | |
| parent | d4b20c96c4030ebb5eb908dc6efcf45be7a8355d (diff) | |
| parent | 1d0804b49f56fe722b12f83269d98acfdee7ac77 (diff) | |
| download | pleroma-433c01b370f4bf68d3f016d86c1527b1319e7a0c.tar.gz pleroma-433c01b370f4bf68d3f016d86c1527b1319e7a0c.zip | |
Merge branch 'develop' into refactor/notification_settings
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", |
