diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2015-11-30 14:11:09 +0100 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2015-11-30 14:12:57 +0100 |
| commit | 42272de3a64a4b7346992b730aa191afbe9c90d9 (patch) | |
| tree | eba22c75684047887d1f3c4da9a74da7ddbb4041 | |
| parent | d8aa44d4583b26e933a0a15f96c9706297af41f1 (diff) | |
| download | nextcloud-server-42272de3a64a4b7346992b730aa191afbe9c90d9.tar.gz nextcloud-server-42272de3a64a4b7346992b730aa191afbe9c90d9.zip | |
update bootstrap from 3.3.5 to 3.3.6
| -rw-r--r-- | bower.json | 2 | ||||
| -rw-r--r-- | core/vendor/bootstrap/js/tooltip.js | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/bower.json b/bower.json index 50d9df266fe..eb8d1ce0b7f 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 c3fe4b06ca2..7094b34dce7 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 |