Skip to content

S
syncEnrollments
Commit 9bb3c9fb authored by Taylor Otwell's avatar Taylor Otwell
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents c82c5ece f40e72fa
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
resources/lang/en/validation.php
View file @ 9bb3c9fb
...@@ -41,6 +41,7 @@ return [ ...@@ -41,6 +41,7 @@ return [
'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.',
......
resources/views/errors/503.blade.php
View file @ 9bb3c9fb
...@@ -3,7 +3,7 @@ ...@@ -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 {
......
resources/views/welcome.blade.php
View file @ 9bb3c9fb
...@@ -3,7 +3,7 @@ ...@@ -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 {
......
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