]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b5d004e 5065134)
Merge remote-tracking branch 'upstream/develop' into 1610-priority-dbclean
authorMichael <heluecht@pirati.ca>
Sat, 5 Nov 2016 05:25:22 +0000 (05:25 +0000)
committerMichael <heluecht@pirati.ca>
Sat, 5 Nov 2016 05:25:22 +0000 (05:25 +0000)
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.