Merge branch 'master' into develop

2013-10-13 20:57:43 -05:00 · 2013-10-13 20:57:43 -05:00 · 80b1c853ce
parent 0d011da4e5 1745513035
commit 80b1c853ce
2 changed files with 3 additions and 4 deletions
--- a/.gitignore
+++ b/.gitignore
@ -2,4 +2,5 @@
 /vendor
 composer.phar
 composer.lock
-.DS_Store
+.DS_Store
+Thumbs.db
--- 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": [