From: kaniini <ariadne@dereferenced.org>
Date: Wed, 17 Jul 2019 23:03:30 +0000 (+0000)
Subject: Merge branch 'patch-3' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=a51ee5fae5c16307538bdc5350a067b59634adc7;p=akkoma

Merge branch 'patch-3' into 'develop'

Update otp_en.md - Added creation of initial admin user

See merge request pleroma/pleroma!1445
---

a51ee5fae5c16307538bdc5350a067b59634adc7