diff options
| author | Mark Felder <feld@FreeBSD.org> | 2020-09-10 16:02:11 -0500 |
|---|---|---|
| committer | Mark Felder <feld@FreeBSD.org> | 2020-09-10 16:05:22 -0500 |
| commit | 55562ca9362d66553ea3638c91174bbeb6c637f1 (patch) | |
| tree | bb0b57d0a40dec779b0bfbfcbf65f3b9d3bea2b3 /test/instance_static/emoji/test_pack | |
| parent | 39f7fc5b8ef781c98136d1f9be50a14bff394233 (diff) | |
| parent | 6316350918d1f55167fa384d55f385ff2c93e6bb (diff) | |
| download | pleroma-55562ca9362d66553ea3638c91174bbeb6c637f1.tar.gz pleroma-55562ca9362d66553ea3638c91174bbeb6c637f1.zip | |
Merge branch 'develop' into feature/gen-magic
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", |
