]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5649e9e 3f2a55c)
Merge remote-tracking branch 'upstream/develop' into 1511-contact-evolution
authorMichael Vogel <icarus@dabo.de>
Sun, 29 Nov 2015 16:05:40 +0000 (17:05 +0100)
committerMichael Vogel <icarus@dabo.de>
Sun, 29 Nov 2015 16:05:40 +0000 (17:05 +0100)
1  2 
mod/contacts.php patch | diff1 | diff2 | blob | history

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