Merge branch 'patch-3' into 'develop'
authorlain <lain@soykaf.club>
Thu, 9 Jul 2020 09:25:10 +0000 (09:25 +0000)
committerlain <lain@soykaf.club>
Thu, 9 Jul 2020 09:25:10 +0000 (09:25 +0000)
commit6854c5ba2f317bb891e50ecdf1577f387c8916de
treed911602ea5975c217626b7ecde4555e2d3f8ebe6
parent6335b32aa8f5c54cf5f09638189a77cad5785077
parent6465257e1fafd8c4c2ad8fead10ac76bf781fedd
Merge branch 'patch-3' into 'develop'

missed `:` (colon) before mrf_steal_emoji

See merge request pleroma/pleroma!2738