]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8cab3b5 cfea3cc)
Merge remote-tracking branch 'upstream/develop' into 1610-performance
authorMichael Vogel <ike@pirati.ca>
Mon, 24 Oct 2016 08:12:13 +0000 (08:12 +0000)
committerMichael Vogel <ike@pirati.ca>
Mon, 24 Oct 2016 08:12:13 +0000 (08:12 +0000)
1  2 
include/Contact.php patch | diff1 | diff2 | blob | history
mod/item.php patch | diff1 | diff2 | blob | history

diff --cc include/Contact.php
Simple merge
diff --cc mod/item.php
Simple merge
Unnamed repository; edit this file 'description' to name the repository.