Merge branch 'master' into develop

437ea546 · Taylor Otwell · 70238846 · 73094f26 · 437ea546
Commit 437ea546 authored Jan 19, 2014 by Taylor Otwell
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

.gitignore .gitignore +2 -0

No files found.
--- a/.gitignore
+++ b/.gitignore
@@ -2,5 +2,7 @@
 /vendor
 composer.phar
 composer.lock
+.env.local.php
+.env.php
 .DS_Store
 Thumbs.db
\ No newline at end of file