David A. Windham
david
/
laravel
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge remote-tracking branch 'origin/master'

Taylor Otwell 9 years ago
parent
c82c5eceda f40e72fa2f
commit
9bb3c9fb3e
3 changed files with 3 additions and 2 deletions
Split View Show Diff Stats
  1. 1 0
      resources/lang/en/validation.php
  2. 1 1
      resources/views/errors/503.blade.php
  3. 1 1
      resources/views/welcome.blade.php

+ 1 - 0
resources/lang/en/validation.php
View File 

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

+ 1 - 1
resources/views/errors/503.blade.php
View File 

@@ -3,7 +3,7 @@
 
     <head>
 
         <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>
 
             html, body {

+ 1 - 1
resources/views/welcome.blade.php
View File 

@@ -3,7 +3,7 @@
 
     <head>
 
         <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>
 
             html, body {