Merge branch 'emoji-pack-json-pretty' into 'develop'
authorkaniini <ariadne@dereferenced.org>
Mon, 23 Sep 2019 22:30:31 +0000 (22:30 +0000)
committerkaniini <ariadne@dereferenced.org>
Mon, 23 Sep 2019 22:30:31 +0000 (22:30 +0000)
commitdb0c00db8beb0a1197d313fa5733a43a0e6c07e8
tree09f64ceb8877cd5bba475256eaccd164ff5573cf
parentf60beecfa7891d06018f8065b865188118e99eac
parente63f167f013c1c159c40745ee44535c65b999ffb
Merge branch 'emoji-pack-json-pretty' into 'develop'

Also pretty print pack.json

See merge request pleroma/pleroma!1710