Merge branch 'patch-3' into 'develop'
authorkaniini <ariadne@dereferenced.org>
Wed, 17 Jul 2019 23:03:30 +0000 (23:03 +0000)
committerkaniini <ariadne@dereferenced.org>
Wed, 17 Jul 2019 23:03:30 +0000 (23:03 +0000)
commita51ee5fae5c16307538bdc5350a067b59634adc7
tree250747e8c42f912be35ee5ab3d2fc0209e57b9a9
parent1e48af9acf01bf66bd03babccbf08089eb909788
parentcdecef2a084eca629d2c6f72d083362a2113dbd2
Merge branch 'patch-3' into 'develop'

Update otp_en.md - Added creation of initial admin user

See merge request pleroma/pleroma!1445