friendica-github/include/Core
Michael 967ecb4205 Merge remote-tracking branch 'upstream/develop' into 1610-performance
Conflicts:
	include/Core/Config.php
	include/Core/PConfig.php
2016-10-25 16:16:01 +00:00
..
Config.php Reverted changes to config 2016-10-24 11:57:17 -04:00
PConfig.php Merge remote-tracking branch 'upstream/develop' into 1610-performance 2016-10-25 16:16:01 +00:00