DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-27 22:49:41 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
snipe-it/app/Http/Controllers/Auth
History
snipe 784bf4d784 Merge remote-tracking branch 'origin/master' into develop 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	.github/ISSUE_TEMPLATE/feature_request.yml
#	app/Http/Controllers/CustomFieldsetsController.php
#	app/Http/Controllers/ReportsController.php
#	config/version.php
#	package-lock.json
#	package.json
#	public/css/dist/all.css
#	public/css/dist/bootstrap-table.css
#	public/js/dist/bootstrap-table.js
#	public/mix-manifest.json
#	resources/views/users/print.blade.php
#	webpack.mix.js
2022-05-06 01:52:43 -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-06 01:52:43 -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 Adopt Laravel coding style 2021-06-10 20:15:52 +00:00