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)
commit14054dd582f905439bb73368335f93bbb9bc23c7
treed5eefa933d2673cb9c0f7147c72da58a887307ec
parent33b033421649f6a7354616ff3458b856ca89637c
parent748fff6544cc70476bb0892a661d4d8c7f6ee295
Merge branch 'feature/auto-shortcodes' into 'develop'

Feature: automatic shortcodes for emoji

See merge request pleroma/pleroma!245