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
..
assets	Audit dark mode theme skins and check for [ch15847] (#9102)	2021-02-25 19:41:31 -08:00
lang	Merge branch 'master' of https://github.com/ajsy/snipe-it into ajsy-master	2021-04-05 20:55:49 -07:00
macros	Add a way for a user to override the site skin setting + fix mislabeled comment. (#6891)	2021-03-29 19:09:23 -07:00
views	Merge branch 'master' of https://github.com/ajsy/snipe-it into ajsy-master	2021-04-05 20:55:49 -07:00