diff options
| author | Maxim Filippov <colixer@gmail.com> | 2019-09-26 19:01:54 +0300 |
|---|---|---|
| committer | Maxim Filippov <colixer@gmail.com> | 2019-09-26 19:01:54 +0300 |
| commit | e7836adf21421de7a6d1d84fd605ec7d7f207cda (patch) | |
| tree | ca378665486e37ec82a19feb95c84d2131b83e7a /test/instance_static/emoji/test_pack | |
| parent | df15ed13d15db5b5a371345fcb9968b5af4100af (diff) | |
| parent | 6abe12dceda8d0d32878208987a9631d5d546a3d (diff) | |
| download | pleroma-e7836adf21421de7a6d1d84fd605ec7d7f207cda.tar.gz pleroma-e7836adf21421de7a6d1d84fd605ec7d7f207cda.zip | |
Merge branch 'develop' into feature/moderation-log-filters
Diffstat (limited to 'test/instance_static/emoji/test_pack')
| -rw-r--r-- | test/instance_static/emoji/test_pack/blank.png | bin | 0 -> 95 bytes | |||
| -rw-r--r-- | test/instance_static/emoji/test_pack/pack.json | 13 |
2 files changed, 13 insertions, 0 deletions
diff --git a/test/instance_static/emoji/test_pack/blank.png b/test/instance_static/emoji/test_pack/blank.png Binary files differnew file mode 100644 index 000000000..8f50fa023 --- /dev/null +++ b/test/instance_static/emoji/test_pack/blank.png diff --git a/test/instance_static/emoji/test_pack/pack.json b/test/instance_static/emoji/test_pack/pack.json new file mode 100644 index 000000000..5a8ee75f9 --- /dev/null +++ b/test/instance_static/emoji/test_pack/pack.json @@ -0,0 +1,13 @@ +{ + "pack": { + "license": "Test license", + "homepage": "https://pleroma.social", + "description": "Test description", + + "share-files": true + }, + + "files": { + "blank": "blank.png" + } +} |
