Merge branch 'feature/auto-shortcodes' into 'develop'
authorlambda <pleromagit@rogerbraun.net>
Thu, 12 Jul 2018 05:56:29 +0000 (05:56 +0000)
committerlambda <pleromagit@rogerbraun.net>
Thu, 12 Jul 2018 05:56:29 +0000 (05:56 +0000)
Feature: automatic shortcodes for emoji

See merge request pleroma/pleroma!245


Trivial merge