diff options
| author | Maksim Pechnikov <parallel588@gmail.com> | 2019-09-23 21:32:50 +0300 |
|---|---|---|
| committer | Maksim Pechnikov <parallel588@gmail.com> | 2019-09-23 21:32:50 +0300 |
| commit | 38245f13367cdc2df29ff2a499418e526b654fb5 (patch) | |
| tree | 514724023f061f56e42fcaa7ae79f07d3d055c58 /test/instance_static/emoji/test_pack | |
| parent | d4ed3a35b8aa34cd968113970bbab445eb251703 (diff) | |
| parent | fd48bd80eb7eab563c25586b1deba2ed42c02c5a (diff) | |
| download | pleroma-38245f13367cdc2df29ff2a499418e526b654fb5.tar.gz pleroma-38245f13367cdc2df29ff2a499418e526b654fb5.zip | |
Merge branch 'develop' into test/activity_pub/transmogrifier.ex
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" + } +} |
