Merge branch 'hotifx/emoji-trailing' into 'develop'
authorrinpatch <rinpatch@sdf.org>
Thu, 5 Sep 2019 19:23:52 +0000 (19:23 +0000)
committerrinpatch <rinpatch@sdf.org>
Thu, 5 Sep 2019 19:23:52 +0000 (19:23 +0000)
commit592ce8a74f1db0dee2e98e5f8e96a11bbadabcfe
tree1535db820c09a3564a48f8443c931d2f628d5905
parentfe7cf44c405ae2872d8d978f566bbb8e6fba0480
parent3523bdcf262dddc7bdf14d759538097f8838cddb
Merge branch 'hotifx/emoji-trailing' into 'develop'

Call TrailingFormatPlug for /api/pleroma/emoji

See merge request pleroma/pleroma!1634