projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
abead01
2ae1128
)
Merge branch 'fix/mastodon-api-settings' into 'develop'
author
kaniini
<nenolod@gmail.com>
Thu, 6 Dec 2018 16:01:58 +0000
(16:01 +0000)
committer
kaniini
<nenolod@gmail.com>
Thu, 6 Dec 2018 16:01:58 +0000
(16:01 +0000)
Fix put_settings and remove info_changeset
See merge request pleroma/pleroma!507
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
projects / akkoma / commitdiff