projects / civicrm-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1c0d8fc 3daed29)
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)
CRM-17982 - CRM_Core_Config_MagicMerge - Fix warning on demos sites

1  2 
CRM/Utils/File.php patch | diff1 | diff2 | blob | history

diff --cc CRM/Utils/File.php
Simple merge