diff options
| author | Mark Felder <feld@FreeBSD.org> | 2020-10-09 11:26:10 -0500 |
|---|---|---|
| committer | Mark Felder <feld@FreeBSD.org> | 2020-10-09 11:26:10 -0500 |
| commit | 04b514c567aa664d2606313d17be69e665a7f1af (patch) | |
| tree | 13f46fd39d8a90837b031b1081b7e20696d6823a /test/instance_static/emoji/blobs.gg | |
| parent | 55562ca9362d66553ea3638c91174bbeb6c637f1 (diff) | |
| parent | d239bd3ca4348d38c12ab54c7e2e9cb2b825cc3c (diff) | |
| download | pleroma-04b514c567aa664d2606313d17be69e665a7f1af.tar.gz pleroma-04b514c567aa664d2606313d17be69e665a7f1af.zip | |
Merge branch 'develop' into feature/gen-magic
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 |
