Merge branch 'patch-3' into 'develop'
authorHaelwenn <git.pleroma.social@hacktivis.me>
Wed, 12 Sep 2018 18:01:11 +0000 (18:01 +0000)
committerHaelwenn <git.pleroma.social@hacktivis.me>
Wed, 12 Sep 2018 18:01:11 +0000 (18:01 +0000)
commit90661e20cf91b2b1e95fdee73f2e95aa18c1be65
tree04df310540c2363c289f93e1d48d9b11724ab68d
parentda3f93054392447638d4bc558fae0969e6a9bbf9
parent85b8590109bc1f1f13ac26fa06b607909ade7bb2
Merge branch 'patch-3' into 'develop'

Add visible_in_picker to status emojis

See merge request pleroma/pleroma!342