aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2015-01-01 10:35:19 -0800
committerMark Otto <[email protected]>2015-01-01 10:35:19 -0800
commit401889a8dc7d530d9be3b6b005afe03856089437 (patch)
tree41e1a802722909d23586ba0a366fcf4552a2fbb4 /js
parent548d46eb8b88f3876ec325be8500080c78934925 (diff)
parent576230b92ae5a082eb8e058dc2fab7c67c99bd19 (diff)
downloadbootstrap-401889a8dc7d530d9be3b6b005afe03856089437.tar.xz
bootstrap-401889a8dc7d530d9be3b6b005afe03856089437.zip
Merge pull request #15477 from ZDroid/2015
Happy New Year
Diffstat (limited to 'js')
-rw-r--r--js/affix.js2
-rw-r--r--js/alert.js2
-rw-r--r--js/button.js2
-rw-r--r--js/carousel.js2
-rw-r--r--js/collapse.js2
-rw-r--r--js/dropdown.js2
-rw-r--r--js/modal.js2
-rw-r--r--js/popover.js2
-rw-r--r--js/scrollspy.js2
-rw-r--r--js/tab.js2
-rw-r--r--js/tooltip.js2
-rw-r--r--js/transition.js2
12 files changed, 12 insertions, 12 deletions
diff --git a/js/affix.js b/js/affix.js
index 04f389e2c..1f067342c 100644
--- a/js/affix.js
+++ b/js/affix.js
@@ -2,7 +2,7 @@
* Bootstrap: affix.js v3.3.1
* http://getbootstrap.com/javascript/#affix
* ========================================================================
- * Copyright 2011-2014 Twitter, Inc.
+ * Copyright 2011-2015 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* ======================================================================== */
diff --git a/js/alert.js b/js/alert.js
index 7b775dd0a..1ba3a44e1 100644
--- a/js/alert.js
+++ b/js/alert.js
@@ -2,7 +2,7 @@
* Bootstrap: alert.js v3.3.1
* http://getbootstrap.com/javascript/#alerts
* ========================================================================
- * Copyright 2011-2014 Twitter, Inc.
+ * Copyright 2011-2015 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* ======================================================================== */
diff --git a/js/button.js b/js/button.js
index 7b1e134b2..2d71f350b 100644
--- a/js/button.js
+++ b/js/button.js
@@ -2,7 +2,7 @@
* Bootstrap: button.js v3.3.1
* http://getbootstrap.com/javascript/#buttons
* ========================================================================
- * Copyright 2011-2014 Twitter, Inc.
+ * Copyright 2011-2015 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* ======================================================================== */
diff --git a/js/carousel.js b/js/carousel.js
index 99a077c10..468a78d59 100644
--- a/js/carousel.js
+++ b/js/carousel.js
@@ -2,7 +2,7 @@
* Bootstrap: carousel.js v3.3.1
* http://getbootstrap.com/javascript/#carousel
* ========================================================================
- * Copyright 2011-2014 Twitter, Inc.
+ * Copyright 2011-2015 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* ======================================================================== */
diff --git a/js/collapse.js b/js/collapse.js
index a2ede5914..8ffa1e708 100644
--- a/js/collapse.js
+++ b/js/collapse.js
@@ -2,7 +2,7 @@
* Bootstrap: collapse.js v3.3.1
* http://getbootstrap.com/javascript/#collapse
* ========================================================================
- * Copyright 2011-2014 Twitter, Inc.
+ * Copyright 2011-2015 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* ======================================================================== */
diff --git a/js/dropdown.js b/js/dropdown.js
index 69a40f681..980424d63 100644
--- a/js/dropdown.js
+++ b/js/dropdown.js
@@ -2,7 +2,7 @@
* Bootstrap: dropdown.js v3.3.1
* http://getbootstrap.com/javascript/#dropdowns
* ========================================================================
- * Copyright 2011-2014 Twitter, Inc.
+ * Copyright 2011-2015 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* ======================================================================== */
diff --git a/js/modal.js b/js/modal.js
index 93891aa4e..6be32fcd8 100644
--- a/js/modal.js
+++ b/js/modal.js
@@ -2,7 +2,7 @@
* Bootstrap: modal.js v3.3.1
* http://getbootstrap.com/javascript/#modals
* ========================================================================
- * Copyright 2011-2014 Twitter, Inc.
+ * Copyright 2011-2015 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* ======================================================================== */
diff --git a/js/popover.js b/js/popover.js
index 3a0bab38b..034d6efd9 100644
--- a/js/popover.js
+++ b/js/popover.js
@@ -2,7 +2,7 @@
* Bootstrap: popover.js v3.3.1
* http://getbootstrap.com/javascript/#popovers
* ========================================================================
- * Copyright 2011-2014 Twitter, Inc.
+ * Copyright 2011-2015 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* ======================================================================== */
diff --git a/js/scrollspy.js b/js/scrollspy.js
index c468262f3..20a3e4060 100644
--- a/js/scrollspy.js
+++ b/js/scrollspy.js
@@ -2,7 +2,7 @@
* Bootstrap: scrollspy.js v3.3.1
* http://getbootstrap.com/javascript/#scrollspy
* ========================================================================
- * Copyright 2011-2014 Twitter, Inc.
+ * Copyright 2011-2015 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* ======================================================================== */
diff --git a/js/tab.js b/js/tab.js
index d59827f2e..01f233634 100644
--- a/js/tab.js
+++ b/js/tab.js
@@ -2,7 +2,7 @@
* Bootstrap: tab.js v3.3.1
* http://getbootstrap.com/javascript/#tabs
* ========================================================================
- * Copyright 2011-2014 Twitter, Inc.
+ * Copyright 2011-2015 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* ======================================================================== */
diff --git a/js/tooltip.js b/js/tooltip.js
index a3bed9856..a1140d247 100644
--- a/js/tooltip.js
+++ b/js/tooltip.js
@@ -3,7 +3,7 @@
* http://getbootstrap.com/javascript/#tooltip
* Inspired by the original jQuery.tipsy by Jason Frame
* ========================================================================
- * Copyright 2011-2014 Twitter, Inc.
+ * Copyright 2011-2015 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* ======================================================================== */
diff --git a/js/transition.js b/js/transition.js
index 68c2bd60b..1853b5f2e 100644
--- a/js/transition.js
+++ b/js/transition.js
@@ -2,7 +2,7 @@
* Bootstrap: transition.js v3.3.1
* http://getbootstrap.com/javascript/#transitions
* ========================================================================
- * Copyright 2011-2014 Twitter, Inc.
+ * Copyright 2011-2015 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* ======================================================================== */