diff options
author | lain <lain@soykaf.club> | 2020-11-04 16:52:30 +0100 |
---|---|---|
committer | lain <lain@soykaf.club> | 2020-11-04 16:52:30 +0100 |
commit | 7bbc328d66aaac8d680f52521c6823aea42821af (patch) | |
tree | 5fa2ef3e91fd880e9170c718cca8245d73dc4ca3 /test/instance_static/emoji/blobs.gg | |
parent | de2499e54b33a1746e5f6a5b79f1422d31c11570 (diff) | |
parent | 78cea44553c936813ffc2c4c47984a64255096ef (diff) | |
download | pleroma-7bbc328d66aaac8d680f52521c6823aea42821af.tar.gz pleroma-7bbc328d66aaac8d680f52521c6823aea42821af.zip |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into stats-genserver-fix
Diffstat (limited to 'test/instance_static/emoji/blobs.gg')
-rw-r--r-- | test/instance_static/emoji/blobs.gg/blank.png | bin | 0 -> 95 bytes | |||
-rw-r--r-- | test/instance_static/emoji/blobs.gg/pack.json | 11 |
2 files changed, 11 insertions, 0 deletions
diff --git a/test/instance_static/emoji/blobs.gg/blank.png b/test/instance_static/emoji/blobs.gg/blank.png Binary files differnew file mode 100644 index 000000000..8f50fa023 --- /dev/null +++ b/test/instance_static/emoji/blobs.gg/blank.png diff --git a/test/instance_static/emoji/blobs.gg/pack.json b/test/instance_static/emoji/blobs.gg/pack.json new file mode 100644 index 000000000..481891b08 --- /dev/null +++ b/test/instance_static/emoji/blobs.gg/pack.json @@ -0,0 +1,11 @@ +{ + "files": { + "blank": "blank.png" + }, + "pack": { + "description": "Test description", + "homepage": "https://pleroma.social", + "license": "Test license", + "share-files": true + } +}
\ No newline at end of file |