Merged master minor changes of 3.2

Zizaco · Jul 20, 2014 · 267bd49 · 267bd49
2 parents b9081d4 + 0d83c8e
commit 267bd49
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 1 deletion.
diff --git a/README.md b/README.md
@@ -294,7 +294,7 @@ For example: `"zizaco/confide": "~3.2"` will avoid composer download version 4.0
 ## Release Notes
 
 ### Version 4.0.0 Beta 2
-* UserValidator now adds errors to a existing MessageBag instead of replacing it.
+* UserValidator now adds errors to an existing MessageBag instead of replacing it.
 * Password reset token will expire after 7 days.
 * Added support for custom connections using the $connection attribute of the model.
 * Password reset requests are deleted after being used.

diff --git a/src/config/.gitkeep b/src/config/.gitkeep
diff --git a/src/lang/.gitkeep b/src/lang/.gitkeep
diff --git a/src/migrations/.gitkeep b/src/migrations/.gitkeep
diff --git a/src/views/.gitkeep b/src/views/.gitkeep
diff --git a/tests/.gitkeep b/tests/.gitkeep