Merge branch 'master' into develop

This commit is contained in:
Graham Campbell
2016-03-30 13:11:35 +01:00
8 changed files with 40 additions and 25 deletions

View File

@@ -2,10 +2,10 @@
/*
|--------------------------------------------------------------------------
| Routes File
| Application Routes
|--------------------------------------------------------------------------
|
| Here is where you will register all of the routes in an application.
| Here is where you can register all of the routes for an application.
| It's a breeze. Simply tell Laravel the URIs it should respond to
| and give it the controller to call when that URI is requested.
|
@@ -14,18 +14,3 @@
Route::get('/', function () {
return view('welcome');
});
/*
|--------------------------------------------------------------------------
| Application Routes
|--------------------------------------------------------------------------
|
| This route group applies the "web" middleware group to every route
| it contains. The "web" middleware group is defined in your HTTP
| kernel and includes session state, CSRF protection, and more.
|
*/
Route::group(['middleware' => ['web']], function () {
//
});