Merge branch 'runtime-config' into 'develop'
authorkaniini <nenolod@gmail.com>
Wed, 7 Nov 2018 22:32:34 +0000 (22:32 +0000)
committerkaniini <nenolod@gmail.com>
Wed, 7 Nov 2018 22:32:34 +0000 (22:32 +0000)
commitb451a92d78b184dda63e6647f815f89c0e37fd98
tree08c91256dd3c5a1324f4c5484f23710fb0645ffd
parenta764e6fdd436e6014ded4baf8ec402d25107f987
parent9070588493bc896e909e05374ff64fb3f893ec53
Merge branch 'runtime-config' into 'develop'

Runtime configuration

See merge request pleroma/pleroma!430
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex