Merge pull request #7530 from JKingsnorth/CRM-17745
[civicrm-core.git] / CRM / Core / Config /
drwxr-xr-x   ..
-rw-r--r-- 14234 MagicMerge.php
-rw-r--r-- 5866 Runtime.php