projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9853c90
02f12ec
)
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/2115
author
lain
<lain@soykaf.club>
Tue, 22 Sep 2020 15:13:46 +0000
(17:13 +0200)
committer
lain
<lain@soykaf.club>
Tue, 22 Sep 2020 15:13:46 +0000
(17:13 +0200)
1
2
lib/pleroma/chat.ex
patch
|
diff1
|
diff2
|
blob
|
history
lib/pleroma/web/api_spec/operations/chat_operation.ex
patch
|
diff1
|
diff2
|
blob
|
history
lib/pleroma/web/pleroma_api/controllers/chat_controller.ex
patch
|
diff1
|
diff2
|
blob
|
history
test/web/pleroma_api/controllers/chat_controller_test.exs
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
lib/pleroma/chat.ex
Simple merge
diff --cc
lib/pleroma/web/api_spec/operations/chat_operation.ex
Simple merge
diff --cc
lib/pleroma/web/pleroma_api/controllers/chat_controller.ex
Simple merge
diff --cc
test/web/pleroma_api/controllers/chat_controller_test.exs
Simple merge
projects / akkoma / commitdiff