mirror/snipe-it
3
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2026-04-02 14:01:08 +00:00
Code Issues Projects Releases Wiki Activity
Files
acb90c7aee3115df151a1104023250dfaf4b66fc
snipe-it/app/Http/Controllers/Auth
History
snipe acb90c7aee Horrible master -> dev merge that makes baby jesus cry :( 
# Conflicts:
#	app/Http/Controllers/Auth/LoginController.php
#	composer.json
#	composer.lock
#	resources/views/auth/two_factor_enroll.blade.php
2019-03-20 02:24:23 -07:00
..
ForgotPasswordController.php
Minor code cleanup bits and bobs (#6805)
2019-03-13 20:12:03 -07:00
LoginController.php
Horrible master -> dev merge that makes baby jesus cry :(
2019-03-20 02:24:23 -07:00
RegisterController.php
Minor code cleanup bits and bobs (#6805)
2019-03-13 20:12:03 -07:00
ResetPasswordController.php
Minor code cleanup bits and bobs (#6805)
2019-03-13 20:12:03 -07:00