diff options
| author | Roman Chvanikov <chvanikoff@pm.me> | 2020-06-23 20:56:55 +0300 |
|---|---|---|
| committer | Roman Chvanikov <chvanikoff@pm.me> | 2020-06-23 20:56:55 +0300 |
| commit | 1471b70ef1550df91687276968108231f1bab604 (patch) | |
| tree | 3a59e7497d665d5ce3d6445132453518bc50601d /test/instance_static/emoji/test_pack | |
| parent | 604a83ae3efe21b231fb524203a883a062102546 (diff) | |
| parent | c7d69e925664ce7125c3938c298d72e94a2a1349 (diff) | |
| download | pleroma-1471b70ef1550df91687276968108231f1bab604.tar.gz pleroma-1471b70ef1550df91687276968108231f1bab604.zip | |
Merge develop
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", |
