Merge branch 'master' into develop

This commit is contained in:
Taylor Otwell 2014-01-18 19:15:48 -06:00
commit 437ea54681
2 changed files with 6 additions and 4 deletions

2
.gitignore vendored
View File

@ -2,5 +2,7 @@
/vendor /vendor
composer.phar composer.phar
composer.lock composer.lock
.env.local.php
.env.php
.DS_Store .DS_Store
Thumbs.db Thumbs.db