Merge pull request #5046 from totten/master-resolver
authorTim Otten <totten@civicrm.org>
Sun, 8 Feb 2015 22:29:40 +0000 (14:29 -0800)
committerTim Otten <totten@civicrm.org>
Sun, 8 Feb 2015 22:29:40 +0000 (14:29 -0800)
CRM-15578 - Add Civi\Core\Resolver. Fix loading of Angular content after updating components.

1  2 
CRM/Admin/Form/Setting/Component.php
CRM/Core/BAO/Setting.php
CRM/Core/Invoke.php
CRM/Core/Menu.php
CRM/Core/PseudoConstant.php

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge