shane/rockviewer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge V2 branch

Browse source
This commit is contained in:
Shane Frischkorn 2015-02-24 14:05:43 +10:00
parent 5adaad5bf8
commit 138494c4b1
82 changed files with 8952 additions and 4985 deletions
Download patch file Download diff file Expand all files Collapse all files

5
admin/js/jquery.init.js
View file

@ -3,6 +3,5 @@
* namespace (i.e. this preserves pre-existing values for both window.$ and
* window.jQuery).
*/
var django = {
"jQuery": jQuery.noConflict(true)
};
var django = django || {};
django.jQuery = jQuery.noConflict(true);