snipe 780222d372 Merge remote-tracking branch 'origin/master' into develop ...

Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	app/Http/Controllers/Api/AssetsController.php
#	app/Http/Controllers/Auth/LoginController.php
#	resources/views/users/print.blade.php

2022-05-10 17:26:26 -07:00

..

ForgotPasswordController.php

Merge remote-tracking branch 'origin/master' into develop

2022-02-20 13:29:12 -08:00

LoginController.php

Merge remote-tracking branch 'origin/master' into develop

2022-05-10 17:26:26 -07:00

RegisterController.php

Adopt Laravel coding style

2021-06-10 20:15:52 +00:00

ResetPasswordController.php

Adopt Laravel coding style

2021-06-10 20:15:52 +00:00

SamlController.php

Merge remote-tracking branch 'origin/master' into develop

2022-05-10 17:26:26 -07:00