Commit 8e049297 authored by Shpuld Shpludson's avatar Shpuld Shpludson

Merge branch 'develop' into 'master'

Update master for 2.0.2

See merge request pleroma/pleroma-fe!1088
parents 38455294 32ab69fe
Pipeline #24269 passed with stages
in 9 minutes and 2 seconds