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)
commitf884987ace0f060860b2ece0304cfba0708505a5
treecdbc51e5b81c54f5b3233a9d5257a69abfb185bc
parent5ca643b80de6e8b82ccb2411b1fa1259a8d565ae
parente47089cf5506952befd6995f04e2683a168ff9e2
Merge branch 'admin-config-description' into 'develop'

Admin config description

Closes #1178 and #1209

See merge request pleroma/pleroma!1611