diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2020-04-30 16:09:51 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2020-04-30 16:09:51 +0000 |
| commit | 55a3a3c3e52247427cf0c5b1ad459e86a2be0097 (patch) | |
| tree | e59780987ac02a0ca80ce4231602de978b40f7e4 /test/instance_static/emoji/test_pack | |
| parent | 4c4344b7b17a2ddb1c597b059e0a7dcc043e02b2 (diff) | |
| parent | 4a487e4d0b744edac0d83306b80e4bd0cdef5358 (diff) | |
| download | pleroma-55a3a3c3e52247427cf0c5b1ad459e86a2be0097.tar.gz pleroma-55a3a3c3e52247427cf0c5b1ad459e86a2be0097.zip | |
Merge branch 'emoji-upload' into 'develop'
Updated emoji API endpoints
Closes #1649, #1604, and #1545
See merge request pleroma/pleroma!2179
Diffstat (limited to 'test/instance_static/emoji/test_pack')
| -rw-r--r-- | test/instance_static/emoji/test_pack/pack.json | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/test/instance_static/emoji/test_pack/pack.json b/test/instance_static/emoji/test_pack/pack.json index 5a8ee75f9..481891b08 100644 --- a/test/instance_static/emoji/test_pack/pack.json +++ b/test/instance_static/emoji/test_pack/pack.json @@ -1,13 +1,11 @@ { + "files": { + "blank": "blank.png" + }, "pack": { - "license": "Test license", - "homepage": "https://pleroma.social", "description": "Test description", - + "homepage": "https://pleroma.social", + "license": "Test license", "share-files": true - }, - - "files": { - "blank": "blank.png" } -} +}
\ No newline at end of file |