Commit 8b7860f1 authored by kaniini's avatar kaniini

Merge branch 'admin-config' into 'develop'

Admin config

See merge request pleroma/pleroma!1328
parents 72f365df b37ede5d
Pipeline #13729 passed with stages
in 56 minutes and 55 seconds