Merge pull request #4962 from totten/master-angular-ts
authorTim Otten <totten@civicrm.org>
Wed, 21 Jan 2015 09:17:13 +0000 (01:17 -0800)
committerTim Otten <totten@civicrm.org>
Wed, 21 Jan 2015 09:17:13 +0000 (01:17 -0800)
CRM-15832 - AngularJS - Aggregate and localize strings+partials

12 files changed:
1  2 
CRM/Case/Info.php
CRM/Core/Form.php
CRM/Core/I18n.php
CRM/Core/Invoke.php
CRM/Core/Page.php
CRM/Core/Page/AJAX.php
CRM/Core/Resources.php
CRM/Event/Form/ManageEvent/Registration.php
CRM/Mailing/Info.php
CRM/Utils/File.php
Civi/Core/Container.php
tests/phpunit/CRM/Core/ResourcesTest.php

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge