]> git.mxchange.org Git - friendica.git/commit
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)
commitd2280d4120ca09ff5f3013e961a1f43bb5244cc6
tree40ea6b275c50d35dfc6784aae2f31b7371596e73
parentf844d96a7f9ea47a5be346cfd973200115d81bc5
parent51155d7716da454d74366be3aec557eb7117e308
Merge remote-tracking branch 'upstream/develop' into develop

dbm::is_result() calls needed merge

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