diff options
| author | lain <lain@soykaf.club> | 2020-06-22 08:41:09 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-06-22 08:41:09 +0000 |
| commit | 93ae1c8bd34dee8e789c83e88d3279c5958c4c2a (patch) | |
| tree | 51c41636fa2d40273b8cc850925b9c1be732e665 /test/instance_static/emoji/test_pack | |
| parent | 6efd3730c31c9121894c825b1bef87796a67d000 (diff) | |
| parent | b5f13af7ba66924f6aed448bd519f6becc269922 (diff) | |
| download | pleroma-93ae1c8bd34dee8e789c83e88d3279c5958c4c2a.tar.gz pleroma-93ae1c8bd34dee8e789c83e88d3279c5958c4c2a.zip | |
Merge branch 'feature/1854-emoji-pagination' into 'develop'
Emoji and packs pagination
Closes #1854
See merge request pleroma/pleroma!2658
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", |
