Add in fixes for CRM-18708 as well as its needed on 4.7 and make minor fix as suggest...
[civicrm-core.git] / CRM / Core / Config /
drwxr-xr-x   ..
-rw-r--r-- 14752 MagicMerge.php
-rw-r--r-- 6172 Runtime.php