Merge branch 'update/admin-fe-20190930' into 'develop'
authorkaniini <ariadne@dereferenced.org>
Mon, 30 Sep 2019 12:53:28 +0000 (12:53 +0000)
committerkaniini <ariadne@dereferenced.org>
Mon, 30 Sep 2019 12:53:28 +0000 (12:53 +0000)
commitdfab2232f8238b1560e447c2f855479746045fe1
tree3f7ed0f07bc9b74234a3e2e051551d760102b575
parent905bb11747fb87f2ad960175e1fc73aa0e3657a0
parent28be12b38e0eb68ac702bf5e214f32f5bec4695b
Merge branch 'update/admin-fe-20190930' into 'develop'

update admin fe

See merge request pleroma/pleroma!1747