Merge branch 'master' into develop

This commit is contained in:
Taylor Otwell 2015-10-31 13:38:28 -05:00
commit c6ed15e126
1 changed files with 1 additions and 0 deletions

View File

@ -60,6 +60,7 @@
'regex' => 'The :attribute format is invalid.',
'required' => 'The :attribute field is required.',
'required_if' => 'The :attribute field is required when :other is :value.',
'required_unless' => 'The :attribute field is required unless :other is in :value.',
'required_with' => 'The :attribute field is required when :values is present.',
'required_with_all' => 'The :attribute field is required when :values is present.',
'required_without' => 'The :attribute field is required when :values is not present.',