Merge branch 'master' of github.com:cachethq/cachet

2015-02-20 08:24:54 +00:00
parent c873668a3d cf913979ae
commit 831720d587
14 changed files with 170 additions and 42 deletions
--- a/app/config/packages/dingo/api/config.php
+++ b/app/config/packages/dingo/api/config.php
@@ -154,6 +154,6 @@ return [

        'json' => new Dingo\Api\Http\ResponseFormat\JsonResponseFormat(),

-    ]
+    ],

 ];
--- a/app/routes/dashboard.php
+++ b/app/routes/dashboard.php
@@ -93,7 +93,7 @@ Route::group(['before' => 'auth', 'prefix' => 'dashboard', 'namespace' => 'Cache
        Route::group(['before' => 'admin'], function () {
            Route::get('add', [
                'as'   => 'dashboard.team.add',
-                'uses' => 'DashTeamController@showAddTeamMemberView'
+                'uses' => 'DashTeamController@showAddTeamMemberView',
            ]);
            Route::get('{user}', 'DashTeamController@showTeamMemberView');
            Route::post('add', 'DashTeamController@postAddUser');