Merge branch 'emoji-notifications' into 'develop'
authorHaelwenn <contact+git.pleroma.social@hacktivis.me>
Thu, 23 Jan 2020 02:12:03 +0000 (02:12 +0000)
committerHaelwenn <contact+git.pleroma.social@hacktivis.me>
Thu, 23 Jan 2020 02:12:03 +0000 (02:12 +0000)
commitdddebee047efc4ab1dff6565bef32954695846a7
tree550cf393f8406919e70e1b3aa5fa67ff365b57b8
parent73e6bbbe8973d81688e0916e616cd4726ad659c2
parent002146d2979afcebe1b3d0c720eb011aa9dbebd0
Merge branch 'emoji-notifications' into 'develop'

Emoji notifications

See merge request pleroma/pleroma!2130