diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-10-05 23:50:08 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-10-05 23:50:08 +0300 |
| commit | 6c2264af24e70e8279508e0166350e8034e139e4 (patch) | |
| tree | 1fce808270f82b8a7e5fe38e94b672c8bf7d8a59 /test/instance_static | |
| parent | 094edde7c4ddf65f46e5d692a5ef5b859587d1e1 (diff) | |
| parent | 4d852f3e78d6fcfe7bb2ef8b8d3a2f29359dd20c (diff) | |
| download | pleroma-6c2264af24e70e8279508e0166350e8034e139e4.tar.gz pleroma-6c2264af24e70e8279508e0166350e8034e139e4.zip | |
Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances
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 |
