diff options
author | Bernhard Posselt <Raydiation@users.noreply.github.com> | 2015-07-23 19:25:09 +0200 |
---|---|---|
committer | Bernhard Posselt <Raydiation@users.noreply.github.com> | 2015-07-23 19:25:09 +0200 |
commit | 582f07950f45d9e0bdfa8faaefa105cad5d39420 (patch) | |
tree | 83582e253b040995dfe8b337b137e49448087903 /core/js/core.json | |
parent | 01b7e306c427f00d1ce4570c3d1bc90f72e25644 (diff) | |
parent | 03a6e12bdb77242d38e08c9f3c78076e499bcaff (diff) | |
download | nextcloud-server-582f07950f45d9e0bdfa8faaefa105cad5d39420.tar.gz nextcloud-server-582f07950f45d9e0bdfa8faaefa105cad5d39420.zip |
Merge pull request #17075 from owncloud/bootstrap-tooltip
Replace jQuery tipsy with bootstrap tooltip
Diffstat (limited to 'core/js/core.json')
-rw-r--r-- | core/js/core.json | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/js/core.json b/core/js/core.json index e75db534550..0f052b798a9 100644 --- a/core/js/core.json +++ b/core/js/core.json @@ -6,11 +6,11 @@ "underscore/underscore.js", "moment/min/moment-with-locales.js", "handlebars/handlebars.js", - "blueimp-md5/js/md5.js" + "blueimp-md5/js/md5.js", + "bootstrap/js/tooltip.js" ], "libraries": [ "jquery-showpassword.js", - "jquery-tipsy.js", "jquery.avatar.js", "placeholder.js" ], |