Merge branch 'fix/mastodon-api-settings' into 'develop'
authorkaniini <nenolod@gmail.com>
Thu, 6 Dec 2018 16:01:58 +0000 (16:01 +0000)
committerkaniini <nenolod@gmail.com>
Thu, 6 Dec 2018 16:01:58 +0000 (16:01 +0000)
commit1d531fd2f32a7f8fff562a3122b30b8ccdccead0
tree230906410c1b24fcd35d6646af2ab87e46ced91b
parentabead01ab6f5586e60d467d7efd0de560a97c5bd
parent2ae1128d9f7a89aff6ba7fb3d486a00f76dbc28b
Merge branch 'fix/mastodon-api-settings' into 'develop'

Fix put_settings and remove info_changeset

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