Merge branch 'runtime-fixes' into 'develop'
authorkaniini <nenolod@gmail.com>
Tue, 20 Nov 2018 22:25:35 +0000 (22:25 +0000)
committerkaniini <nenolod@gmail.com>
Tue, 20 Nov 2018 22:25:35 +0000 (22:25 +0000)
commita591a044a9c4e0bef1190d7895c8aba11a4cd476
tree79558efeda20b4fdff7a837af29fdcbd61dfe89f
parentc7d08bc1cf37417f8275839f493d09981f2f7e09
parentbcecdc3ab194135d5bc17496b8091a6c17775c87
Merge branch 'runtime-fixes' into 'develop'

Various runtime configuration fixes

See merge request pleroma/pleroma!468
lib/pleroma/application.ex
lib/pleroma/web/federator/federator.ex