Merge branch 'master' into develop

2014-08-22 08:34:14 -05:00
parent 3ee17a92e8 462b91157b
commit 3e9e9c6cb7
1 changed files with 1 additions and 0 deletions
--- a/resources/lang/en/validation.php
+++ b/resources/lang/en/validation.php
@@ -72,6 +72,7 @@ return array(
 	),
 	"unique"               => "The :attribute has already been taken.",
 	"url"                  => "The :attribute format is invalid.",
+	"timezone"             => "The :attribute must be a valid zone.",

 	/*
 	|--------------------------------------------------------------------------