Merge branch 'hj-happiness-improvement' into 'develop'
authorkaniini <nenolod@gmail.com>
Tue, 29 Jan 2019 13:54:10 +0000 (13:54 +0000)
committerkaniini <nenolod@gmail.com>
Tue, 29 Jan 2019 13:54:10 +0000 (13:54 +0000)
commitd03a116654bd7c4329b698a0f175e37aea8c2caa
treeb5ea94fb5a001d3b2d3858921c480f8f58fb077b
parentebb3496386c1e195b48bcdc9d72c4c30e60fe340
parentf53d464db0194eb66557b00c7d92b9df8c798ada
Merge branch 'hj-happiness-improvement' into 'develop'

New frontend configuration mechanism.

Closes #445

See merge request pleroma/pleroma!700
config/config.exs
docs/config.md
lib/pleroma/application.ex
lib/pleroma/web/router.ex