Merge master

2013-03-04 21:30:25 -06:00
parent 947b4a1cb9 ac8d15b509
commit 838bea1402
23 changed files with 261 additions and 261 deletions
--- a/assets/js/plugins/bootstrap/bootstrap-carousel.js
+++ b/assets/js/plugins/bootstrap/bootstrap-carousel.js
@@ -1,5 +1,5 @@
 /* ==========================================================
- * bootstrap-carousel.js v2.3.0
+ * bootstrap-carousel.js v2.3.1
 * http://twitter.github.com/bootstrap/javascript.html#carousel
 * ==========================================================
 * Copyright 2012 Twitter, Inc.
@@ -75,7 +75,7 @@
      if (!e) this.paused = true
      if (this.$element.find('.next, .prev').length && $.support.transition.end) {
        this.$element.trigger($.support.transition.end)
-        this.cycle()
+        this.cycle(true)
      }
      clearInterval(this.interval)
      this.interval = null