]> git.mxchange.org Git - friendica.git/commitdiff
Merge branch 'rewrites/dbm_is_result' into develop
authorRoland Häder <roland@mxchange.org>
Mon, 19 Dec 2016 13:47:05 +0000 (14:47 +0100)
committerRoland Häder <roland@mxchange.org>
Mon, 19 Dec 2016 13:47:05 +0000 (14:47 +0100)
1  2 
include/Contact.php
include/items.php
include/plugin.php
include/socgraph.php
mod/profiles.php
mod/regmod.php

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc mod/regmod.php
Simple merge