Taylor Otwell 4070dc98d4 fix conflicts

2018-12-18 09:06:40 -06:00

..

Auth

fix conflicts

2018-12-18 09:06:40 -06:00

Controller.php

remove unneeded trait

2016-04-28 10:28:26 -05:00