https://reisub.nsupdate.info/git
/
friendica.git
/
.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
ae8d726
6930029
)
Merge remote-tracking branch 'upstream/develop' into public-redir
author
Michael
<heluecht@pirati.ca>
Fri, 1 Jun 2018 12:32:51 +0000
(12:32 +0000)
committer
Michael
<heluecht@pirati.ca>
Fri, 1 Jun 2018 12:32:51 +0000
(12:32 +0000)
1
2
include/conversation.php
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
include/conversation.php
Simple merge