]> git.mxchange.org Git - friendica.git/commit
Merge remote-tracking branch 'upstream/develop' into rewrites/coding-convention
authorRoland Haeder <roland@mxchange.org>
Mon, 20 Mar 2017 19:51:32 +0000 (20:51 +0100)
committerRoland Haeder <roland@mxchange.org>
Mon, 20 Mar 2017 19:51:32 +0000 (20:51 +0100)
commit09851331a9dc8601919cd0c9200686b92843d235
treec8c8e56100ae8efd3baf12c7efa0f1e3fb96c6aa
parente9b083d13d9a94bd77e7fdad0f5d7795b4a2b764
parent7a95fcf02a85650e010b7e5fbc7ae9814341b4d1
Merge remote-tracking branch 'upstream/develop' into rewrites/coding-convention

Signed-off-by: Roland Haeder <roland@mxchange.org>
18 files changed:
boot.php
include/Contact.php
include/cron.php
include/datetime.php
include/dbstructure.php
include/dfrn.php
include/event.php
include/identity.php
include/lock.php
include/onepoll.php
include/poller.php
include/security.php
include/socgraph.php
mod/contacts.php
mod/events.php
mod/profiles.php
mod/settings.php
update.php