Merge branch 'finmoji-optional' into 'develop'
authorkaniini <nenolod@gmail.com>
Thu, 25 Oct 2018 18:24:07 +0000 (18:24 +0000)
committerkaniini <nenolod@gmail.com>
Thu, 25 Oct 2018 18:24:07 +0000 (18:24 +0000)
commit9fe9c098831fa2071bbe68024d135736208addb5
tree4e5a39a0ea442c56ac990368806e6aa52f996871
parent63556150e1226baceb4ae152376243f6bf691249
parentae5beb7b6464d9bc4532693987d9d94cd5bac6bd
Merge branch 'finmoji-optional' into 'develop'

Make finmoji optional

See merge request pleroma/pleroma!391