Merge branch 'admin-config-description' into 'develop'
authorrinpatch <rinpatch@sdf.org>
Fri, 13 Sep 2019 12:36:24 +0000 (12:36 +0000)
committerrinpatch <rinpatch@sdf.org>
Fri, 13 Sep 2019 12:36:24 +0000 (12:36 +0000)
Admin config description

Closes #1178 and #1209

See merge request pleroma/pleroma!1611


Trivial merge