webapp/bookstack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-07-31 15:24:31 +03:00
Code Activity

Merge branch 'master' into translations

Browse Source
This commit is contained in:
Dan Brown
2016-12-31 14:32:52 +00:00
committed by GitHub
parent c9700e38e2 286f9b0c7d
commit a24f3d7d47
8 changed files with 37 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
routes/web.php
View File

@ -154,7 +154,7 @@ Route::group(['middleware' => 'auth'], function () {
});
// Social auth routes
Route::get('/login/service/{socialDriver}', 'Auth\RegisterController@getSocialLogin');
Route::get('/login/service/{socialDriver}', 'Auth\LoginController@getSocialLogin');
Route::get('/login/service/{socialDriver}/callback', 'Auth\RegisterController@socialCallback');
Route::get('/login/service/{socialDriver}/detach', 'Auth\RegisterController@detachSocialAccount');
Route::get('/register/service/{socialDriver}', 'Auth\RegisterController@socialRegister');