projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5e37ade ab8b9ab)
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)
Split emoji to default and custom.

See merge request pleroma/pleroma!56


Trivial merge
Fork of https://akkoma.dev/AkkomaGang/akkoma.git