]> git.mxchange.org Git - friendica.git/commit
projects / friendica.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5171695 cc16369)
Merge remote-tracking branch 'upstream/develop' into develop
authorRoland Häder <roland@mxchange.org>
Tue, 20 Dec 2016 14:44:31 +0000 (15:44 +0100)
committerRoland Häder <roland@mxchange.org>
Tue, 20 Dec 2016 14:44:31 +0000 (15:44 +0100)
commitb9e4b9f2747deb5cdd7d7f68e200496e0c3162aa
tree27edd52ebfb80e8256b46ebf0a9752d75406633btree | snapshot
parent51716957b24d97c20f078d1f880a6ca112cae792commit | diff
parentcc16369b6f45eff2c0faa91bda96ae619f9f80e4commit | diff
Merge remote-tracking branch 'upstream/develop' into develop

Changes in #3034 were somehow conflicting. :-(

Signed-off-by: Roland Häder <roland@mxchange.org>
Conflicts:
include/like.php
mod/photos.php
mod/subthread.php
include/like.php diff1 | diff2 | blob | history
include/notifier.php diff1 | diff2 | blob | history
mod/photos.php diff1 | diff2 | blob | history
mod/subthread.php diff1 | diff2 | blob | history
mod/tagger.php diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.