summaryrefslogtreecommitdiff
path: root/test/instance_static/emoji/test_pack
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2020-05-04 10:43:20 +0200
committerlain <lain@soykaf.club>2020-05-04 10:43:20 +0200
commitc40afe5ba040964834657ef18f92bf9f1a1770d1 (patch)
tree842774fee81293fc9f65a23beaa0a312acf7ab92 /test/instance_static/emoji/test_pack
parent9249742f13445f47167d4b352751c49caf48aa8f (diff)
parent095635453ac58b9e01a32ad226c0b61466c16da0 (diff)
downloadpleroma-c40afe5ba040964834657ef18f92bf9f1a1770d1.tar.gz
pleroma-c40afe5ba040964834657ef18f92bf9f1a1770d1.zip
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
Diffstat (limited to 'test/instance_static/emoji/test_pack')
-rw-r--r--test/instance_static/emoji/test_pack/pack.json14
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