Merge branch 'admin-fixes' into 'develop'
authorkaniini <ariadne@dereferenced.org>
Sat, 3 Aug 2019 18:16:09 +0000 (18:16 +0000)
committerkaniini <ariadne@dereferenced.org>
Sat, 3 Aug 2019 18:16:09 +0000 (18:16 +0000)
commit4ae0a6652f2aaa04c8f96a7bfb4ffe35c8bfdeaf
tree53f9822563351ae9af3e021261ae97a2832a9671
parent99ce6d6044606f8a91cb101c7f08a493a6644ee8
parentde0f3b73dd7c76b6b19b38804f98f6e7ccba7222
Merge branch 'admin-fixes' into 'develop'

Admin fixes

See merge request pleroma/pleroma!1524