Merge branch 'admin-config' into 'develop'
authorkaniini <nenolod@gmail.com>
Sun, 23 Jun 2019 05:42:37 +0000 (05:42 +0000)
committerkaniini <nenolod@gmail.com>
Sun, 23 Jun 2019 05:42:37 +0000 (05:42 +0000)
commit8b7860f12fd9cdf82332fdd8d9ce5696d5e13dd7
tree567fabaf7764681503899ecd46676006cc7084ab
parent72f365df07e2eba75d3339629b01e5a8913513e6
parentb37ede5df349ce70bca7a51ab1da7e22d262bdfe
Merge branch 'admin-config' into 'develop'

Admin config

See merge request pleroma/pleroma!1328