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

Merge remote-tracking branch 'origin/master'

This commit is contained in:
Taylor Otwell 2015-08-06 12:07:10 -05:00
parent da7376d461 51299e78cd
commit f478406894
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1,4 +1,5 @@
/vendor /vendor
/node_modules /node_modules
Homestead.yaml Homestead.yaml
Homestead.json
.env .env

2
package.json
View File

@ -4,7 +4,7 @@
"gulp": "^3.8.8" "gulp": "^3.8.8"
}, },
"dependencies": { "dependencies": {
"laravel-elixir": "^2.0.0", "laravel-elixir": "^3.0.0",
"bootstrap-sass": "^3.0.0" "bootstrap-sass": "^3.0.0"
} }
} }