]> git.mxchange.org Git - friendica.git/commit
projects / friendica.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 177f93f 7141ce9)
Merge remote-tracking branch 'friendica/develop' into bug/fix-diaspora-people-links
authorHypolite Petovan <mrpetovan@gmail.com>
Tue, 20 Dec 2016 17:50:36 +0000 (12:50 -0500)
committerHypolite Petovan <mrpetovan@gmail.com>
Tue, 20 Dec 2016 17:50:36 +0000 (12:50 -0500)
commite8e1f9253da63a11c813708f5baaeba2d9f537f3
treeaa785e8d2e8e07ab3c8a27c8c56af01d72648099tree | snapshot
parent177f93f9a5ddae8cfb8124748a4e1a2392c4c526commit | diff
parent7141ce91635e071a54ec57b2971f9c745a996fc0commit | diff
Merge remote-tracking branch 'friendica/develop' into bug/fix-diaspora-people-links

# Conflicts:
# include/follow.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
mod/dfrn_confirm.php diff1 | diff2 | blob | history
mod/fetch.php diff1 | diff2 | blob | history
mod/item.php diff1 | diff2 | blob | history
mod/p.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.