Merge branch 'master' into develop

This commit is contained in:
Taylor Otwell 2013-10-13 20:57:43 -05:00
commit 80b1c853ce
2 changed files with 3 additions and 4 deletions

3
.gitignore vendored
View File

@ -2,4 +2,5 @@
/vendor /vendor
composer.phar composer.phar
composer.lock composer.lock
.DS_Store .DS_Store
Thumbs.db

View File

@ -20,10 +20,8 @@
"post-install-cmd": [ "post-install-cmd": [
"php artisan optimize" "php artisan optimize"
], ],
"pre-update-cmd": [
"php artisan clear-compiled"
],
"post-update-cmd": [ "post-update-cmd": [
"php artisan clear-compiled",
"php artisan optimize" "php artisan optimize"
], ],
"post-create-project-cmd": [ "post-create-project-cmd": [