From: Michael Date: Tue, 25 Oct 2016 16:16:01 +0000 (+0000) Subject: Merge remote-tracking branch 'upstream/develop' into 1610-performance X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=967ecb42053dd5bd2b7d66435641ae865c54066b;p=friendica.git Merge remote-tracking branch 'upstream/develop' into 1610-performance Conflicts: include/Core/Config.php include/Core/PConfig.php --- 967ecb42053dd5bd2b7d66435641ae865c54066b