diff options
| author | Mark Felder <feld@FreeBSD.org> | 2020-06-30 15:09:03 -0500 |
|---|---|---|
| committer | Mark Felder <feld@FreeBSD.org> | 2020-06-30 15:09:03 -0500 |
| commit | 0883a706dc376fdfb7de9df1366803e87c8e7c98 (patch) | |
| tree | dc43f7b09dddd3300efd7b3ebbc0e82e60a978c5 /test/instance_static/emoji/test_pack | |
| parent | 954acdda2072cac343409b3d17d831b86ac6a18c (diff) | |
| parent | b9e6ad571ac5925431466d6e6b27c0b372bb7727 (diff) | |
| download | pleroma-0883a706dc376fdfb7de9df1366803e87c8e7c98.tar.gz pleroma-0883a706dc376fdfb7de9df1366803e87c8e7c98.zip | |
Merge branch 'develop' into activation-meta
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", |
