From: kaniini <nenolod@gmail.com>
Date: Thu, 6 Dec 2018 16:01:58 +0000 (+0000)
Subject: Merge branch 'fix/mastodon-api-settings' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=1d531fd2f32a7f8fff562a3122b30b8ccdccead0;p=akkoma

Merge branch 'fix/mastodon-api-settings' into 'develop'

Fix put_settings and remove info_changeset

See merge request pleroma/pleroma!507
---

1d531fd2f32a7f8fff562a3122b30b8ccdccead0