Merge branch 'develop' into 'develop'
authorkaniini <ariadne@dereferenced.org>
Sun, 4 Aug 2019 04:32:09 +0000 (04:32 +0000)
committerkaniini <ariadne@dereferenced.org>
Sun, 4 Aug 2019 04:32:09 +0000 (04:32 +0000)
commitb9497ead3513ba3b93e9a4549e482f4a720aa83d
treec23fe2d35bdf2f8aa3943ffe34eaa37cf8297eab
parentb1fb5b93aeea5ae95c9d4cfc3ded8e330f2b0a66
parent9b9453ceaf492ef3af18c12ce67e144a718fd65a
Merge branch 'develop' into 'develop'

Fix a stale link and a few typos

See merge request pleroma/pleroma!1529