snipe 4ddab03792 Merge branch 'develop' of https://github.com/sw-mreyes/snipe-it into sw-mreyes-develop ... # Conflicts: # public/mix-manifest.json		2021-02-19 10:00:35 -08:00
..
assets	Merge branch 'develop' of https://github.com/sw-mreyes/snipe-it into sw-mreyes-develop	2021-02-19 10:00:35 -08:00
lang	Nicer formatting of the page if custom logout [ch15660]	2021-02-03 14:56:26 -08:00
macros	Localization digit separator feature. (#8915)	2020-12-15 11:49:13 -08:00
views	Fixed weird table formatting in expected checkin report	2021-02-17 13:44:35 -08:00