Merge branch 'master' into develop

80b1c853 · Taylor Otwell · 0d011da4 · 17455130 · 80b1c853 · 80b1c853
Commit 80b1c853 authored Oct 14, 2013 by Taylor Otwell
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 4 deletions

.gitignore .gitignore +2 -1

composer.json composer.json +1 -3

No files found.
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,5 @@
 /vendor
 composer.phar
 composer.lock
-.DS_Store
\ No newline at end of file
+.DS_Store
+Thumbs.db
\ No newline at end of file
--- a/composer.json
+++ b/composer.json
@@ -20,10 +20,8 @@
 		"post-install-cmd": [
 			"php artisan optimize"
 		],
-		"pre-update-cmd": [
-			"php artisan clear-compiled"
-		],
 		"post-update-cmd": [
+			"php artisan clear-compiled",
 			"php artisan optimize"
 		],
 		"post-create-project-cmd": [