Merge branch 'crm-13089-CRM_Core_BAO_CustomField_overrides_name' of git://github...
[civicrm-core.git] / js / jquery.conflict.js
1 var cj = jQuery.noConflict(); $ = cj;