Merge branch 'develop' into 'develop'
authorlambda <pleromagit@rogerbraun.net>
Sun, 20 May 2018 19:37:16 +0000 (19:37 +0000)
committerlambda <pleromagit@rogerbraun.net>
Sun, 20 May 2018 19:37:16 +0000 (19:37 +0000)
commit961f1312571843209487cc1caa9355fa6552d965
tree23d5f0dc1fac441506ac6e3aeae5d152dbb849bf
parent413de8e4bcacc363958673d33787195823f7fe87
parent9c3e2069d079e9a9a9735c7cce57a3a90add48c6
Merge branch 'develop' into 'develop'

Correct 'register_user' parameters in README

See merge request pleroma/pleroma!163