]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ca41e91 2aa5af4)
Merge remote-tracking branch 'upstream/develop' into archive-contact
authorMichael <heluecht@pirati.ca>
Mon, 4 Dec 2017 19:05:53 +0000 (19:05 +0000)
committerMichael <heluecht@pirati.ca>
Mon, 4 Dec 2017 19:05:53 +0000 (19:05 +0000)
1  2 
include/items.php patch | diff1 | diff2 | blob | history
src/Object/Contact.php patch | diff1 | diff2 | blob | history

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