Resolving issues settng up the site

This commit is contained in:
Hillel Coren 2014-04-09 15:07:50 +03:00
parent bd2ef0b7b6
commit fc65576fd5
2 changed files with 2 additions and 1 deletions

1
.gitignore vendored
View File

@ -7,6 +7,7 @@
/public/logo /public/logo
/public/build /public/build
/public/vendor /public/vendor
/public/packages
/bootstrap/compiled.php /bootstrap/compiled.php
/bootstrap/environment.php /bootstrap/environment.php
/vendor /vendor

View File

@ -19,6 +19,6 @@
"pdfjs": "*" "pdfjs": "*"
}, },
"resolutions": { "resolutions": {
"jquery": "~1.*" "jquery": "~1.10.*"
} }
} }