Merge pull request #7774 from totten/master-dash-err
authorcolemanw <coleman@civicrm.org>
Tue, 9 Feb 2016 20:06:14 +0000 (15:06 -0500)
committercolemanw <coleman@civicrm.org>
Tue, 9 Feb 2016 20:06:14 +0000 (15:06 -0500)
commitc5906cd389825b4f2fc5ad50d2c7b67eb581f813
treea302cd10e823f7e0bd5312ccd05aa1ed01860b45
parent1c0d8fcc7f082e3461b6e78e53d85e2c83cd494a
parent3daed292c71109e2fb873cfbf8b5fc2c525b0ab1
Merge pull request #7774 from totten/master-dash-err

CRM-17982 - CRM_Core_Config_MagicMerge - Fix warning on demos sites
CRM/Utils/File.php