]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3c220dd 1046f25)
Merge remote-tracking branch 'upstream/3.5.1rc' into 1702-only-worker
authorMichael <heluecht@pirati.ca>
Tue, 28 Feb 2017 06:49:21 +0000 (06:49 +0000)
committerMichael <heluecht@pirati.ca>
Tue, 28 Feb 2017 06:49:21 +0000 (06:49 +0000)
1  2 
include/discover_poco.php patch | diff1 | diff2 | blob | history

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