]> git.mxchange.org Git - friendica.git/commit
projects / friendica.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5d0db51 9e689e8)
Merge remote-tracking branch 'upstream/develop' into rewrites/app_get_baseurl_static
authorRoland Häder <roland@mxchange.org>
Thu, 22 Dec 2016 10:33:00 +0000 (11:33 +0100)
committerRoland Häder <roland@mxchange.org>
Thu, 22 Dec 2016 10:33:00 +0000 (11:33 +0100)
commitad20c5504deba9dbb4ea5c5deba598f2c448b344
treec57eef3f0af2a93eab0e49f76a879b06f7de99c3tree | snapshot
parent5d0db51fdf560d9599af461664188451941d5295commit | diff
parent9e689e8b9bfd7dd3519c678e020627af0ccb5777commit | diff
Merge remote-tracking branch 'upstream/develop' into rewrites/app_get_baseurl_static

Signed-off-by: Roland Häder <roland@mxchange.org>
Conflicts:
include/diaspora.php
object/Item.php
13 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/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.