Merge branch 'admin-config-fix' into 'develop'
authorkaniini <ariadne@dereferenced.org>
Tue, 23 Jul 2019 19:17:00 +0000 (19:17 +0000)
committerkaniini <ariadne@dereferenced.org>
Tue, 23 Jul 2019 19:17:00 +0000 (19:17 +0000)
commit5230b9ef3df9f1bbab373e911fef26aa21667f59
tree54fca50145c3ba516e35e9b18326703a5d56bb63
parentdd96be5c8b07a82ade10e8e4033f8274ece69888
parent5e72554f3c6490ebdaaa8238f34860fa362016fc
Merge branch 'admin-config-fix' into 'develop'

Admin config fix

See merge request pleroma/pleroma!1471