]> git.mxchange.org Git - friendica.git/commit
Merge remote-tracking branch 'upstream/develop' into 1610-performance
authorMichael <heluecht@pirati.ca>
Tue, 25 Oct 2016 16:16:01 +0000 (16:16 +0000)
committerMichael <heluecht@pirati.ca>
Tue, 25 Oct 2016 16:16:01 +0000 (16:16 +0000)
commit967ecb42053dd5bd2b7d66435641ae865c54066b
treec88f214b49c1756f3c82ea0a0743a1d1786b5cef
parent80efc422bf8f87370388ad8e34ea94cf7ae72616
parent4fdced1a0a9949cd49cb645bc5ac0948e9ce408a
Merge remote-tracking branch 'upstream/develop' into 1610-performance

Conflicts:
include/Core/Config.php
include/Core/PConfig.php
boot.php
doc/htconfig.md
include/Core/PConfig.php