Merge branch 'chore/floki-update' into 'develop'
authorlain <lain@soykaf.club>
Tue, 18 Feb 2020 13:09:37 +0000 (13:09 +0000)
committerlain <lain@soykaf.club>
Tue, 18 Feb 2020 13:09:37 +0000 (13:09 +0000)
commitfb6c2576dcb5dce6122b699738e2ccdaaa0fc2c6
tree9d43dddd9be97f9575f07a562d36d3a9461a0b09
parent962eb8d4ac1aafeed6e3ae9b17847b9afaec7712
parent81cc9dd085aea60bd0bd24607095f7c36a8e65bb
Merge branch 'chore/floki-update' into 'develop'

Update floki to 0.25

See merge request pleroma/pleroma!2217