projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
244655e
19fbfbb
)
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/mastoapi...
author
lain
<lain@soykaf.club>
Fri, 3 Jul 2020 14:44:31 +0000
(16:44 +0200)
committer
lain
<lain@soykaf.club>
Fri, 3 Jul 2020 14:44:31 +0000
(16:44 +0200)
1
2
lib/pleroma/web/api_spec/schemas/status.ex
patch
|
diff1
|
diff2
|
blob
|
history
lib/pleroma/web/mastodon_api/views/status_view.ex
patch
|
diff1
|
diff2
|
blob
|
history
test/web/common_api/common_api_test.exs
patch
|
diff1
|
diff2
|
blob
|
history
test/web/mastodon_api/views/status_view_test.exs
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
lib/pleroma/web/api_spec/schemas/status.ex
Simple merge
diff --cc
lib/pleroma/web/mastodon_api/views/status_view.ex
Simple merge
diff --cc
test/web/common_api/common_api_test.exs
Simple merge
diff --cc
test/web/mastodon_api/views/status_view_test.exs
Simple merge
projects / akkoma / commitdiff