Merge branch 'fix/masto-put-settings' into 'develop'
authoreal <eal@waifu.club>
Sun, 16 Dec 2018 11:21:26 +0000 (11:21 +0000)
committereal <eal@waifu.club>
Sun, 16 Dec 2018 11:21:26 +0000 (11:21 +0000)
commit28478a9c4f652e67de659adb93155a0dfda4b09f
tree305d95059b0a55552ab04bb84a0e2c32ddf3424a
parent8b279aca5fec4ee38852e587e2d1d2a54392281b
parent4c783e35c09c74097257ce56fde74025db0024c6
Merge branch 'fix/masto-put-settings' into 'develop'

Mastodon API: Fix PUT /api/web/settings

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