diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2020-06-29 16:09:49 +0400 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2020-06-29 16:09:49 +0400 |
| commit | 4a306720e8be8633e192f7b2c98f129a315939b9 (patch) | |
| tree | ed5ec059c532777a28eade72f384c8a800ead496 /test/instance_static/emoji/test_pack | |
| parent | d15aa9d9503e59b3cd0731394855781f435ec63c (diff) | |
| parent | 651f269568cb7e54cd96d8a0d8ea3533f77e9a3a (diff) | |
| download | pleroma-4a306720e8be8633e192f7b2c98f129a315939b9.tar.gz pleroma-4a306720e8be8633e192f7b2c98f129a315939b9.zip | |
Merge branch 'develop' into remove-twitter-api
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", |
