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

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

This commit is contained in:
Taylor Otwell 2018-08-22 14:12:47 -05:00
parent 4e6838a6cc b2d7facfbb
commit 289b145731
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -11,3 +11,4 @@ Homestead.yaml
npm-debug.log npm-debug.log
yarn-error.log yarn-error.log
.env .env
.phpunit.result.cache

2
package.json
View File

@ -16,7 +16,7 @@
"cross-env": "^5.1", "cross-env": "^5.1",
"jquery": "^3.2", "jquery": "^3.2",
"laravel-mix": "^2.0", "laravel-mix": "^2.0",
"lodash": "^4.17.4", "lodash": "^4.17.5",
"vue": "^2.5.7" "vue": "^2.5.7"
} }
} }

2
readme.md
View File

@ -49,6 +49,8 @@ ## Laravel Sponsors
- [WebL'Agence](https://weblagence.com/) - [WebL'Agence](https://weblagence.com/)
- [Invoice Ninja](https://www.invoiceninja.com) - [Invoice Ninja](https://www.invoiceninja.com)
- [iMi digital](https://www.imi-digital.de/) - [iMi digital](https://www.imi-digital.de/)
- [Earthlink](https://www.earthlink.ro/)
- [Steadfast Collective](https://steadfastcollective.com/)
## Contributing ## Contributing

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

@ -8,15 +8,15 @@
<title>Laravel</title> <title>Laravel</title>
<!-- Fonts --> <!-- 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 --> <!-- Styles -->
<style> <style>
html, body { html, body {
background-color: #fff; background-color: #fff;
color: #636b6f; color: #636b6f;
font-family: 'Raleway', sans-serif; font-family: 'Nunito', sans-serif;
font-weight: 100; font-weight: 200;
height: 100vh; height: 100vh;
margin: 0; margin: 0;
} }