Merge branch 'develop' of github.com:laravel/laravel into develop
Conflicts: public/css/app.css resources/assets/sass/app.scss resources/assets/sass/pages/_welcome.scss resources/views/layouts/app.blade.php resources/views/welcome.blade.php
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
@extends('layouts.app')
|
||||
|
||||
@section('content')
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
<div class="col-sm-8 col-sm-offset-2">
|
||||
<div class="panel panel-default">
|
||||
@@ -46,4 +47,5 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@stop
|
||||
|
||||
Reference in New Issue
Block a user