Fixed rebase issues

2014-12-01 16:46:56 +00:00
parent 7aec301ce6
commit 0fb39f34f8
6 changed files with 37 additions and 17 deletions
@@ -10,10 +10,7 @@ Route::group(['before' => 'has_setting:app_name'], function() {
 });

 Route::group(['before' => 'no_setup:app_name'], function() {
-    Route::get('/setup', 'SetupController@showSetup');
-    Route::group(['before' => 'csrf'], function() {
-        Route::post('/setup', 'SetupController@setupCachet');
-    });
+    Route::controller('/setup', 'SetupController');
 });

 Route::group(['before' => 'auth'], function() {