projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
8b279ac
4c783e3
)
Merge branch 'fix/masto-put-settings' into 'develop'
author
eal
<eal@waifu.club>
Sun, 16 Dec 2018 11:21:26 +0000
(11:21 +0000)
committer
eal
<eal@waifu.club>
Sun, 16 Dec 2018 11:21:26 +0000
(11:21 +0000)
Mastodon API: Fix PUT /api/web/settings
See merge request pleroma/pleroma!557
1
2
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
Simple merge