From 42272de3a64a4b7346992b730aa191afbe9c90d9 Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Mon, 30 Nov 2015 14:11:09 +0100
Subject: [PATCH] update bootstrap from 3.3.5 to 3.3.6
---
bower.json | 2 +-
core/vendor/bootstrap/js/tooltip.js | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/bower.json b/bower.json
index 50d9df266f..eb8d1ce0b7 100644
--- a/bower.json
+++ b/bower.json
@@ -26,7 +26,7 @@
"snapjs": "~2.0.0-rc1",
"strengthify": "0.4.2",
"underscore": "~1.8.0",
- "bootstrap": "~3.3.5",
+ "bootstrap": "~3.3.6",
"backbone": "~1.2.3",
"davclient.js": "https://github.com/evert/davclient.js.git",
"es6-promise": "https://github.com/jakearchibald/es6-promise.git#~2.3.0"
diff --git a/core/vendor/bootstrap/js/tooltip.js b/core/vendor/bootstrap/js/tooltip.js
index c3fe4b06ca..7094b34dce 100644
--- a/core/vendor/bootstrap/js/tooltip.js
+++ b/core/vendor/bootstrap/js/tooltip.js
@@ -1,5 +1,5 @@
/* ========================================================================
- * Bootstrap: tooltip.js v3.3.5
+ * Bootstrap: tooltip.js v3.3.6
* http://getbootstrap.com/javascript/#tooltip
* Inspired by the original jQuery.tipsy by Jason Frame
* ========================================================================
@@ -26,7 +26,7 @@
this.init('tooltip', element, options)
}
- Tooltip.VERSION = '3.3.5'
+ Tooltip.VERSION = '3.3.6'
Tooltip.TRANSITION_DURATION = 150
--
GitLab