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
..
css	Fixed font awesome caret	2021-09-25 23:17:35 -07:00
js	Merge remote-tracking branch 'origin/master' into develop	2022-05-10 17:26:26 -07:00
less	mixes color contrast on dropdown menu from navbar	2022-03-03 09:27:52 -08:00