Annajwaszahro
/
MIF_E31222691
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3839 from PascaleBeier/develop 

[5.3] Make use of Bootstrap 3.3.7 with jQuery 3 support
This commit is contained in:
Taylor Otwell 2016-07-26 15:37:39 -04:00 committed by GitHub
parent 41e2efb0ad 0cfc40e790
commit 9cce61be27
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package.json
View File

@ -5,9 +5,9 @@
"dev": "gulp watch" "dev": "gulp watch"
}, },
"devDependencies": { "devDependencies": {
"bootstrap-sass": "3.3.6", "bootstrap-sass": "^3.3.7",
"gulp": "^3.9.1", "gulp": "^3.9.1",
"jquery": "^2.2.4", "jquery": "^3.1.0",
"js-cookie": "^2.1.2", "js-cookie": "^2.1.2",
"laravel-elixir": "^6.0.0-9", "laravel-elixir": "^6.0.0-9",
"laravel-elixir-vue": "^0.1.4", "laravel-elixir-vue": "^0.1.4",

6
public/css/app.css vendored
View File

File diff suppressed because one or more lines are too long

20
public/js/app.js
View File

File diff suppressed because one or more lines are too long