]> git.mxchange.org Git - friendica.git/commit
Merge remote-tracking branch 'upstream/develop' into 1702-detect-server
authorMichael <heluecht@pirati.ca>
Fri, 17 Mar 2017 15:53:19 +0000 (15:53 +0000)
committerMichael <heluecht@pirati.ca>
Fri, 17 Mar 2017 15:53:19 +0000 (15:53 +0000)
commit87771cf6176df2b0fe4a2b5ea830aa8843279c12
treed9e627443ee6c67b9a8bcbd3b31069121c14fd3c
parent24a57020b92b468607d4b3c9eb61b26f26bb6ce2
parent3cef98caf68d9fa28ba1beacedeaa77917987772
Merge remote-tracking branch 'upstream/develop' into 1702-detect-server

Conflicts:
include/discover_poco.php
include/cron.php
include/discover_poco.php
mod/admin.php