diff options
| author | Roman Chvanikov <chvanikoff@pm.me> | 2019-09-26 10:38:54 +0300 |
|---|---|---|
| committer | Roman Chvanikov <chvanikoff@pm.me> | 2019-09-26 10:38:54 +0300 |
| commit | b4b147000c224ffebe42264e6c60042f5b4c42b1 (patch) | |
| tree | 252466a61361720b65b8ba3a3b4eb4e5699d8fde /test/instance_static/emoji/test_pack | |
| parent | 9fa2586abd915342095574f05358642412db0f04 (diff) | |
| parent | 6abe12dceda8d0d32878208987a9631d5d546a3d (diff) | |
| download | pleroma-b4b147000c224ffebe42264e6c60042f5b4c42b1.tar.gz pleroma-b4b147000c224ffebe42264e6c60042f5b4c42b1.zip | |
Merge develop
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" + } +} |
