]> git.mxchange.org Git - friendica.git/commit
projects / friendica.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 41da37a 9e689e8)
Merge remote-tracking branch 'upstream/develop' into develop
authorRoland Häder <roland@mxchange.org>
Thu, 22 Dec 2016 10:29:56 +0000 (11:29 +0100)
committerRoland Häder <roland@mxchange.org>
Thu, 22 Dec 2016 10:29:56 +0000 (11:29 +0100)
commitc0df692f5fc4eaadb322614069b2c7ed40453fa1
tree029643362cff5336a469641677f562aa4b292367tree | snapshot
parent41da37ae670e1f3238d58916a4837b1907a116dfcommit | diff
parent9e689e8b9bfd7dd3519c678e020627af0ccb5777commit | diff
Merge remote-tracking branch 'upstream/develop' into develop

Signed-off-by: Roland Häder <roland@mxchange.org>
Conflicts:
include/diaspora.php
object/Item.php
14 files changed:
include/Contact.php diff1 | diff2 | blob | history
include/api.php diff1 | diff2 | blob | history
include/contact_selectors.php diff1 | diff2 | blob | history
include/delivery.php diff1 | diff2 | blob | history
include/diaspora.php diff1 | diff2 | blob | history
include/follow.php diff1 | diff2 | blob | history
include/like.php diff1 | diff2 | blob | history
include/notifier.php diff1 | diff2 | blob | history
include/queue.php diff1 | diff2 | blob | history
mod/dfrn_confirm.php diff1 | diff2 | blob | history
mod/fetch.php diff1 | diff2 | blob | history
mod/item.php diff1 | diff2 | blob | history
mod/receive.php diff1 | diff2 | blob | history
object/Item.php diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.