Merge branch 'new-frontend-options' into 'develop'
authorkaniini <nenolod@gmail.com>
Tue, 23 Oct 2018 00:50:28 +0000 (00:50 +0000)
committerkaniini <nenolod@gmail.com>
Tue, 23 Oct 2018 00:50:28 +0000 (00:50 +0000)
commitbcae57afd2f932db4b3c4ee28428ed101f0fec1f
treeebeb88dfb514e027e9a35876046ba47869cdbe61
parentaaf3fc1575badd13ccbce267895492fa0b708bbb
parent3e79d941c81e741c1268523db23a9024ca67bd29
Merge branch 'new-frontend-options' into 'develop'

New frontend options

See merge request pleroma/pleroma!383