diff options
| author | Mark Felder <feld@FreeBSD.org> | 2020-10-06 14:25:20 -0500 |
|---|---|---|
| committer | Mark Felder <feld@FreeBSD.org> | 2020-10-06 14:25:20 -0500 |
| commit | cddca85c8404272080caa661ce59ab5dbafec794 (patch) | |
| tree | aac5b9fe51b26999e2e184ddfa2b4829f33794a5 /test/instance_static | |
| parent | ba7f9459b4798388eb4e441d096302c018354033 (diff) | |
| parent | 2698bbc9f63d0bfd59de182d361db03d54aa2a68 (diff) | |
| download | pleroma-cddca85c8404272080caa661ce59ab5dbafec794.tar.gz pleroma-cddca85c8404272080caa661ce59ab5dbafec794.zip | |
Merge branch 'develop' into revert/rich-media-censorship
Diffstat (limited to 'test/instance_static')
| -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 |
