]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2c3e290 8b2742d)
Merge remote-tracking branch 'upstream/develop' into 1504-contact-update
authorMichael Vogel <icarus@dabo.de>
Sun, 12 Apr 2015 07:59:28 +0000 (09:59 +0200)
committerMichael Vogel <icarus@dabo.de>
Sun, 12 Apr 2015 07:59:28 +0000 (09:59 +0200)
Conflicts:
mod/contacts.php

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.