Merge branch 'fix/split-custom-emoji' into 'develop'
authorlambda <pleromagit@rogerbraun.net>
Wed, 31 Jan 2018 15:24:36 +0000 (15:24 +0000)
committerlambda <pleromagit@rogerbraun.net>
Wed, 31 Jan 2018 15:24:36 +0000 (15:24 +0000)
commit3fa6f3ae42636a2a5ca86e74d3d88826c2b96ed6
tree540071f1306d67c57896eef6a22d63e61212b584
parent5e37adedfb718264fbc3eb3353ccee5244e82a89
parentab8b9ababab97ed40720b86bb1d2631dbdcf4c61
Merge branch 'fix/split-custom-emoji' into 'develop'

Split emoji to default and custom.

See merge request pleroma/pleroma!56