Merge branch 'update-floki' into 'develop'
authorrinpatch <rinpatch@sdf.org>
Mon, 2 Dec 2019 11:18:58 +0000 (11:18 +0000)
committerrinpatch <rinpatch@sdf.org>
Mon, 2 Dec 2019 11:18:58 +0000 (11:18 +0000)
commitd468cba2d56f60a41b0372a381b1017a8d2d046b
tree16ac739c84bc5e01dbbd3085fc47d18551f51c21
parent0d24ab04c5ea779432b4ea174a1d470dac87315d
parentcf52106e059560afb50de5ae8044d0a51278fae1
Merge branch 'update-floki' into 'develop'

Update Floki dependency

See merge request pleroma/pleroma!2028