]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 09fbcbc 0eb69b9)
Merge remote-tracking branch 'upstream/develop' into 1606-contact-priority
authorMichael Vogel <icarus@dabo.de>
Sun, 12 Jun 2016 10:16:24 +0000 (12:16 +0200)
committerMichael Vogel <icarus@dabo.de>
Sun, 12 Jun 2016 10:16:24 +0000 (12:16 +0200)
1  2 
mod/dirfind.php patch | diff1 | diff2 | blob | history

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