diff --git a/.gitignore b/.gitignore index 5bc74ae5bab7..cd5f809c0675 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,7 @@ /public/logo /public/build /public/vendor +/public/packages /bootstrap/compiled.php /bootstrap/environment.php /vendor diff --git a/bower.json b/bower.json index 04ef694a7165..098dc0043940 100644 --- a/bower.json +++ b/bower.json @@ -19,6 +19,6 @@ "pdfjs": "*" }, "resolutions": { - "jquery": "~1.*" + "jquery": "~1.10.*" } }