projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
e71da44
97fb50d
)
Merge branch 'align-mastodon-conversations' into 'develop'
author
lambda
<lain@soykaf.club>
Mon, 3 Jun 2019 09:48:37 +0000
(09:48 +0000)
committer
lambda
<lain@soykaf.club>
Mon, 3 Jun 2019 09:48:37 +0000
(09:48 +0000)
Mastodon Conversations API: Align to Mastodon behavior
See merge request pleroma/pleroma!1215
1
2
test/web/mastodon_api/mastodon_api_controller_test.exs
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
test/web/mastodon_api/mastodon_api_controller_test.exs
Simple merge