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
..
css	Ficing webpack, CSS and JS (*whew* that sucked)	2020-04-27 22:41:33 -07:00
js	Fixed #9129: add missing function formatDatalistSafe to snipeit_modals.js	2021-02-16 13:50:00 +01:00
less	Color of asset selection in bulk checkout [ch15525] (#9145)	2021-02-17 12:56:26 -08:00