]> git.mxchange.org Git - friendica.git/commit
Merge remote-tracking branch 'upstream/develop' into develop
authorRoland Haeder <roland@mxchange.org>
Sat, 31 Dec 2016 16:59:14 +0000 (17:59 +0100)
committerRoland Haeder <roland@mxchange.org>
Sat, 31 Dec 2016 16:59:14 +0000 (17:59 +0100)
commit9ca789b9529dceedc35f637804179e1034b3f1d9
tree7be01aba93ebde8b3ade286297fdf3dfca9352c8
parentd2df464d8c4fe0dab390c3016f651f423bd3b9a4
parentd671af2795c76eea741ac8c13786d67645fb5d67
Merge remote-tracking branch 'upstream/develop' into develop

Signed-off-by: Roland Haeder <roland@mxchange.org>
boot.php
include/diaspora.php
include/event.php
object/Item.php