Annajwaszahro
/
MIF_E31222691
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
Taylor Otwell 2015-08-29 16:36:28 -05:00
parent c82c5eceda f40e72fa2f
commit 9bb3c9fb3e
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
resources/lang/en/validation.php
View File

@ -41,6 +41,7 @@
'in' => 'The selected :attribute is invalid.', 'in' => 'The selected :attribute is invalid.',
'integer' => 'The :attribute must be an integer.', 'integer' => 'The :attribute must be an integer.',
'ip' => 'The :attribute must be a valid IP address.', 'ip' => 'The :attribute must be a valid IP address.',
'json' => 'The :attribute must be a valid JSON string.',
'max' => [ 'max' => [
'numeric' => 'The :attribute may not be greater than :max.', 'numeric' => 'The :attribute may not be greater than :max.',
'file' => 'The :attribute may not be greater than :max kilobytes.', 'file' => 'The :attribute may not be greater than :max kilobytes.',

2
resources/views/errors/503.blade.php
View File

@ -3,7 +3,7 @@
<head> <head>
<title>Be right back.</title> <title>Be right back.</title>
<link href="//fonts.googleapis.com/css?family=Lato:100" rel="stylesheet" type="text/css"> <link href="https://fonts.googleapis.com/css?family=Lato:100" rel="stylesheet" type="text/css">
<style> <style>
html, body { html, body {

2
resources/views/welcome.blade.php
View File

@ -3,7 +3,7 @@
<head> <head>
<title>Laravel</title> <title>Laravel</title>
<link href="//fonts.googleapis.com/css?family=Lato:100" rel="stylesheet" type="text/css"> <link href="https://fonts.googleapis.com/css?family=Lato:100" rel="stylesheet" type="text/css">
<style> <style>
html, body { html, body {