snipe bcd988bb81 Merge branch 'develop' of https://github.com/DeusMaximus/snipe-it into develop ...

# Conflicts:
#	app/Http/Controllers/Auth/LoginController.php

2018-07-17 01:11:15 -07:00

..

ForgotPasswordController.php

…

LoginController.php

Merge branch 'develop' of https://github.com/DeusMaximus/snipe-it into develop

2018-07-17 01:11:15 -07:00

RegisterController.php

Stub and 404 registration routes

2017-12-19 22:14:51 -08:00

ResetPasswordController.php

Fix redirect default on password reset

2017-09-27 16:23:21 -07:00