Merge branch 'new-fe-options' into 'develop'
authorscarlett <nia@netbsd.org>
Mon, 10 Dec 2018 23:32:29 +0000 (23:32 +0000)
committerscarlett <nia@netbsd.org>
Mon, 10 Dec 2018 23:32:29 +0000 (23:32 +0000)
commit2999a08e3590c43c623730b0cbf6b93045ac08c1
treed7155f1de3527f8cfedbbdaadaef1dcaadddc144
parent37bd32e58b4c7b5005b05138d6bbe832dd171095
parente1cbb183276eb44ae620da5018cb1f6134cadfd4
Merge branch 'new-fe-options' into 'develop'

Add new frontend options to server-side config.

See merge request pleroma/pleroma!535