projects
/
civicrm-core.git
/ blob
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
history
|
raw
|
HEAD
Merge remote-tracking branch 'upstream/4.5' into 4.5-4.6-2015-04-13-16-08-08
[civicrm-core.git]
/
js
/
noconflict.js
1
if
(!
window
.
CRM
)
window
.
CRM
= {};
2
window
.
cj
=
CRM
.$ =
jQuery
.
noConflict
(
true
);
3
CRM
.
_
=
_
.
noConflict
();