]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge pull request #11936 from owncloud/bower-jquery
authorLukas Reschke <lukas@owncloud.com>
Wed, 5 Nov 2014 15:43:24 +0000 (16:43 +0100)
committerLukas Reschke <lukas@owncloud.com>
Wed, 5 Nov 2014 15:43:24 +0000 (16:43 +0100)
Bower jquery

1  2 
.scrutinizer.yml
core/js/core.json

Simple merge
index 2fc821b04160f63fe9e1d69fa3b795b818e18b90,86db15e5116a7d61c6a8af8db8749bfd5c5f2e52..137e0217a6f32c8143cf7cc5d9c782724b473f7b
@@@ -3,10 -5,9 +5,8 @@@
                "moment/min/moment-with-locales.js"
        ],
        "libraries": [
-               "jquery-1.10.0.min.js",
-               "jquery-migrate-1.2.1.min.js",
                "jquery-ui-1.10.0.custom.js",
                "jquery-showpassword.js",
 -              "jquery.placeholder.js",
                "jquery-tipsy.js",
                "underscore.js"
        ],