From: lambda <pleromagit@rogerbraun.net>
Date: Thu, 12 Jul 2018 05:56:29 +0000 (+0000)
Subject: Merge branch 'feature/auto-shortcodes' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=14054dd582f905439bb73368335f93bbb9bc23c7;hp=-c;p=akkoma

Merge branch 'feature/auto-shortcodes' into 'develop'

Feature: automatic shortcodes for emoji

See merge request pleroma/pleroma!245
---

14054dd582f905439bb73368335f93bbb9bc23c7