]> git.mxchange.org Git - friendica.git/commit
projects / friendica.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a126db4 fd1afcb)
Merge remote-tracking branch 'upstream/develop' into rewrites/mixed-static-object...
authorRoland Häder <roland@mxchange.org>
Mon, 19 Dec 2016 08:40:34 +0000 (09:40 +0100)
committerRoland Häder <roland@mxchange.org>
Mon, 19 Dec 2016 08:40:34 +0000 (09:40 +0100)
commitff569756ee6c5e058700cf6428918f059525e77c
tree5de1836f94afa781c7d95e601f6ffd88f7f60c83tree | snapshot
parenta126db451ce1583640a4eba581d37967e86f5a87commit | diff
parentfd1afcbd358b0f699eef74c26dbcd54a9ea3c3a9commit | diff
Merge remote-tracking branch 'upstream/develop' into rewrites/mixed-static-object-reference-calls

Signed-off-by: Roland Häder <roland@mxchange.org>
Conflicts:
include/follow.php
include/Contact.php diff1 | diff2 | blob | history
include/cron.php diff1 | diff2 | blob | history
include/follow.php diff1 | diff2 | blob | history
include/user.php diff1 | diff2 | blob | history
mod/install.php diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.