Taylor Otwell a690bb7552 fix conflicts

2015-12-03 12:26:26 -06:00

..

Authenticate.php

update middleware and config

2015-12-03 12:25:38 -06:00

EncryptCookies.php

Override cookie encrypter by default.

2015-06-08 21:16:01 -05:00

RedirectIfAuthenticated.php

fix conflicts

2015-12-03 12:26:26 -06:00

VerifyCsrfToken.php

Additional cs fixes

2015-06-01 15:46:45 +01:00