Merge branch 'better-emoji-packs' into 'develop'
authorrinpatch <rinpatch@sdf.org>
Mon, 23 Sep 2019 18:20:08 +0000 (18:20 +0000)
committerrinpatch <rinpatch@sdf.org>
Mon, 23 Sep 2019 18:20:08 +0000 (18:20 +0000)
commitfd48bd80eb7eab563c25586b1deba2ed42c02c5a
tree7b4647efceeca5885f171bc94371d858a853f2f8
parent472e7b796cfeb1445ee1572df414531655b050ce
parent6b3d5ed6db6a3c73eb1f8373ebd670427aa8849d
Merge branch 'better-emoji-packs' into 'develop'

Shareable emoji packs

Closes #833 and #1096

See merge request pleroma/pleroma!1551