Merge remote-tracking branch 'upstream/4.5' into 4.5-4.6-2015-04-06-18-05-56

[civicrm-core.git] / js / noconflict.js

if (!window.CRM) window.CRM = {};
window.cj = CRM.$ = jQuery.noConflict(true);
CRM._ = _.noConflict();