Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

P

pleroma
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

28478a9c

Commit 28478a9c authored 6 years ago by eal

Downloads
- Plain Diff

Merge branch 'fix/masto-put-settings' into 'develop'

Mastodon API: Fix PUT /api/web/settings

See merge request pleroma/pleroma!557

parents 8b279aca 4c783e35

No related branches found

No related tags found

Loading

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

lib/pleroma/user/info.ex 4 additions, 1 deletion

lib/pleroma/user/info.ex
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex 5 additions, 3 deletions

lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
test/web/mastodon_api/mastodon_api_controller_test.exs 14 additions, 0 deletions

test/web/mastodon_api/mastodon_api_controller_test.exs

with 23 additions and 4 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment