From: rinpatch <rinpatch@sdf.org>
Date: Fri, 14 Jun 2019 16:49:28 +0000 (+0000)
Subject: Merge branch 'feature/add-background-image-to-mastoapi' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=62ffc00a5d5975a75c905bc728feb71cd15a34d3;p=akkoma

Merge branch 'feature/add-background-image-to-mastoapi' into 'develop'

AccountView: Add user background.

See merge request pleroma/pleroma!1280
---

62ffc00a5d5975a75c905bc728feb71cd15a34d3
diff --cc CHANGELOG.md
index 89e8adb41,11f041bdb..86d40d898
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -39,8 -37,8 +39,9 @@@ The format is based on [Keep a Changelo
  - Admin API: added filters (role, tags, email, name) for users endpoint
  - Admin API: Endpoints for managing reports
  - Admin API: Endpoints for deleting and changing the scope of individual reported statuses
 +- Admin API: Endpoints to view and change config settings.
  - AdminFE: initial release with basic user management accessible at /pleroma/admin/
+ - Mastodon API: Add background image setting to update_credentials
  - Mastodon API: [Scheduled statuses](https://docs.joinmastodon.org/api/rest/scheduled-statuses/)
  - Mastodon API: `/api/v1/notifications/destroy_multiple` (glitch-soc extension)
  - Mastodon API: `/api/v1/pleroma/accounts/:id/favourites` (API extension)