]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 941b5fd bf9997b)
Merge remote-tracking branch 'upstream/develop' into 1601-gcontact-total
authorMichael Vogel <icarus@dabo.de>
Mon, 11 Jan 2016 13:25:48 +0000 (14:25 +0100)
committerMichael Vogel <icarus@dabo.de>
Mon, 11 Jan 2016 13:25:48 +0000 (14:25 +0100)
1  2 
include/cron.php patch | diff1 | diff2 | blob | history

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