projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9907e97
38b7946
)
Merge branch 'fix/embeded-relationship-in-follows' into 'develop'
author
rinpatch
<rinpatch@sdf.org>
Fri, 3 May 2019 20:36:13 +0000
(20:36 +0000)
committer
rinpatch
<rinpatch@sdf.org>
Fri, 3 May 2019 20:36:13 +0000
(20:36 +0000)
Fix embeded relationships in Mastodon API
See merge request pleroma/pleroma!1118
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