summaryrefslogtreecommitdiff
path: root/test/instance_static/emoji/test_pack
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2020-05-16 17:07:09 +0000
committerlain <lain@soykaf.club>2020-05-16 17:07:09 +0000
commitd15aa9d9503e59b3cd0731394855781f435ec63c (patch)
tree844810415def046a2fc886d0bc1baeb1ff9afb21 /test/instance_static/emoji/test_pack
parent9cf4c4fa73e68f03791c5cc70505b710be39b677 (diff)
parent3bc1138dd9beec03d2336fa1ad45dd23816f5285 (diff)
downloadpleroma-d15aa9d9503e59b3cd0731394855781f435ec63c.tar.gz
pleroma-d15aa9d9503e59b3cd0731394855781f435ec63c.zip
Merge branch 'develop' into 'remove-twitter-api'
# Conflicts: # lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
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