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:
5fb2e47
eedeb3d
)
Merge remote-tracking branch 'upstream/develop' into 1610-performance-nodeinfo
author
Michael Vogel
<ike@pirati.ca>
Wed, 5 Oct 2016 16:19:42 +0000
(16:19 +0000)
committer
Michael Vogel
<ike@pirati.ca>
Wed, 5 Oct 2016 16:19:42 +0000
(16:19 +0000)
1
2
mod/admin.php
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
mod/admin.php
Simple merge