Commit 3e9e9c6c authored by Taylor Otwell's avatar Taylor Otwell

Merge branch 'master' into develop

parents 3ee17a92 462b9115
......@@ -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.",
/*
|--------------------------------------------------------------------------
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment