Merge branch 'patch-2' into 'develop'
authorrinpatch <rinpatch@sdf.org>
Mon, 11 Mar 2019 05:27:14 +0000 (05:27 +0000)
committerrinpatch <rinpatch@sdf.org>
Mon, 11 Mar 2019 05:27:14 +0000 (05:27 +0000)
commit8e6b8506105a304bca9159bfcd5cc7cb9516e387
treee358c662c452b58cb04c6433a1eebad528cf3424
parent5075e8abe5aca86dba68be044ce6bdfa7b9b7896
parent4826c06172c32e691404eac2da9825e23908e9bc
Merge branch 'patch-2' into 'develop'

[Doc] Rename Mastalab -> Fedilab in Clients.md

See merge request pleroma/pleroma!918