Merge branch 'stable'

[libreplanet-static.git] / 2014 / assets / js / noconflict.js

diff --git a/2014/assets/js/noconflict.js b/2014/assets/js/noconflict.js
new file mode 100644 (file)
index 0000000..7284269
--- /dev/null
+++ b/2014/assets/js/noconflict.js
@@ -0,0 +1 @@
+var cj = jQuery.noConflict(true);