Merge V2 branch

2015-02-24 14:05:43 +10:00
parent 5adaad5bf8
commit 138494c4b1
82 changed files with 8952 additions and 4985 deletions
--- a/admin/js/jquery.init.js
+++ b/admin/js/jquery.init.js
@@ -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);