Merge branch 'master' of github.com:laravel/laravel

taylorotwell · taylorotwell · commit 289b1457317a · 2018-08-22T14:12:47.000-05:00
diff --git a/.gitignore b/.gitignore
@@ -11,3 +11,4 @@ Homestead.yaml
 npm-debug.log
 yarn-error.log
 .env
+.phpunit.result.cache
diff --git a/package.json b/package.json
@@ -16,7 +16,7 @@
         "cross-env": "^5.1",
         "jquery": "^3.2",
         "laravel-mix": "^2.0",
-        "lodash": "^4.17.4",
+        "lodash": "^4.17.5",
         "vue": "^2.5.7"
     }
 }
diff --git a/readme.md b/readme.md
@@ -49,6 +49,8 @@ We would like to extend our thanks to the following sponsors for helping fund on
 - [WebL'Agence](https://weblagence.com/)
 - [Invoice Ninja](https://www.invoiceninja.com)
 - [iMi digital](https://www.imi-digital.de/)
+- [Earthlink](https://www.earthlink.ro/)
+- [Steadfast Collective](https://steadfastcollective.com/)
 
 ## Contributing
 
diff --git a/resources/views/welcome.blade.php b/resources/views/welcome.blade.php
@@ -8,15 +8,15 @@
         <title>Laravel</title>
 
         <!-- Fonts -->
-        <link href="https://fonts.googleapis.com/css?family=Raleway:100,600" rel="stylesheet" type="text/css">
+        <link href="https://fonts.googleapis.com/css?family=Nunito:200,600" rel="stylesheet" type="text/css">
 
         <!-- Styles -->
         <style>
             html, body {
                 background-color: #fff;
                 color: #636b6f;
-                font-family: 'Raleway', sans-serif;
-                font-weight: 100;
+                font-family: 'Nunito', sans-serif;
+                font-weight: 200;
                 height: 100vh;
                 margin: 0;
             }

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`"cross-env": "^5.1",`
`17`	`17`	`"jquery": "^3.2",`
`18`	`18`	`"laravel-mix": "^2.0",`
`19`		`- "lodash": "^4.17.4",`
	`19`	`+ "lodash": "^4.17.5",`
`20`	`20`	`"vue": "^2.5.7"`
`21`	`21`	`}`
`22`	`22`	`}`