snipe b9bab05ac3 Merge branch 'master' of https://github.com/ajsy/snipe-it into ajsy-master ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # resources/views/users/print.blade.php		2021-04-05 20:55:49 -07:00
..
Controllers	Merge branch 'master' of https://github.com/ajsy/snipe-it into ajsy-master	2021-04-05 20:55:49 -07:00
Middleware	Added #8931: add health controller without session (#8978)	2021-01-26 12:10:54 -08:00
Requests	Match setup admin on Quickstart password with min reqs for Settings model	2020-12-11 13:52:48 -08:00
Traits	Added: Caching of settings (#6378)	2018-11-01 19:59:50 -07:00
Transformers	Added #6695: add API endpoint for license seats (#8058)	2021-03-29 19:41:26 -07:00
Kernel.php	Added #8931: add health controller without session (#8978)	2021-01-26 12:10:54 -08:00