Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip

9372fdbf · Mark Otto · 41a410b8 · 593b062c · 9372fdbf
Commit 9372fdbf authored Jan 17, 2012 by Mark Otto
Show whitespace changes
Inline Side-by-side

Showing with 27 additions and 23 deletions

js/bootstrap-transition.js js/bootstrap-transition.js +27 -23

No files found.
--- a/js/bootstrap-transition.js
+++ b/js/bootstrap-transition.js
@@ -17,7 +17,9 @@
 * limitations under the License.
 * ========================================================== */

-$(function () {
+!function( $ ) {
+
+  $(function () {

    "use strict"

@@ -44,4 +46,6 @@ $(function () {
      }
    })()

-})
\ No newline at end of file
+  })
+  
+}( window.jQuery )
\ No newline at end of file