diff options
| author | feld <feld@feld.me> | 2020-10-05 17:52:02 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2020-10-05 17:52:02 +0000 |
| commit | 4d852f3e78d6fcfe7bb2ef8b8d3a2f29359dd20c (patch) | |
| tree | 61947d678e4f0a1be1a71e68f0bf4f03301eb725 /test/instance_static/emoji/blobs.gg | |
| parent | 4b05eb9a321ebdc03588f786683e83427fe31f1c (diff) | |
| parent | 346cc3ac244384d37d1bcbbe888173725465a307 (diff) | |
| download | pleroma-4d852f3e78d6fcfe7bb2ef8b8d3a2f29359dd20c.tar.gz pleroma-4d852f3e78d6fcfe7bb2ef8b8d3a2f29359dd20c.zip | |
Merge branch 'feature/1893-remote-emoji-packs-pagination' into 'develop'
Feature/1893 remote emoji packs pagination
Closes #1893
See merge request pleroma/pleroma!2698
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 |
