Merge branch 'master' of github.com:documentcloud/backbone

addyosmani · Feb 2, 2012 · 0e709e4 · 0e709e4
2 parents aafbcb0 + fc2c4de
commit 0e709e4
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/backbone.js b/backbone.js
@@ -38,7 +38,7 @@
   if (!_ && (typeof require !== 'undefined')) _ = require('underscore');
 
   // For Backbone's purposes, jQuery, Zepto, or Ender owns the `$` variable.
-  var $ = root.jQuery || root.Zepto || root.ender;
+  var $ = root.jQuery || root.Zepto || root.ender || root.$;
 
   // Runs Backbone.js in *noConflict* mode, returning the `Backbone` variable
   // to its previous owner. Returns a reference to this Backbone object.