]> git.mxchange.org Git - friendica.git/commitdiff
Merge remote-tracking branch 'upstream/develop' into develop
authorRoland Haeder <roland@mxchange.org>
Fri, 30 Dec 2016 20:33:41 +0000 (21:33 +0100)
committerRoland Haeder <roland@mxchange.org>
Fri, 30 Dec 2016 20:33:41 +0000 (21:33 +0100)
dbm::is_result() calls needed merge

Signed-off-by: Roland Haeder <roland@mxchange.org>
1  2 
boot.php
include/socgraph.php
mod/admin.php
mod/photos.php

diff --cc boot.php
Simple merge
Simple merge
diff --cc mod/admin.php
Simple merge
diff --cc mod/photos.php
Simple merge