From: lambda <pleromagit@rogerbraun.net>
Date: Sun, 20 May 2018 19:37:16 +0000 (+0000)
Subject: Merge branch 'develop' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=961f1312571843209487cc1caa9355fa6552d965;p=akkoma

Merge branch 'develop' into 'develop'

Correct 'register_user' parameters in README

See merge request pleroma/pleroma!163
---

961f1312571843209487cc1caa9355fa6552d965