From: lambda <pleromagit@rogerbraun.net>
Date: Wed, 31 Jan 2018 15:24:36 +0000 (+0000)
Subject: Merge branch 'fix/split-custom-emoji' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=3fa6f3ae42636a2a5ca86e74d3d88826c2b96ed6;p=akkoma

Merge branch 'fix/split-custom-emoji' into 'develop'

Split emoji to default and custom.

See merge request pleroma/pleroma!56
---

3fa6f3ae42636a2a5ca86e74d3d88826c2b96ed6