snipe 90b8acdd3b Merge branch 'V5_cleanup_js' of https://github.com/jwhulette/snipe-it into jwhulette-V5_cleanup_js ... # Conflicts: # public/mix-manifest.json		2018-10-03 00:56:09 -07:00
..
bulk-edit.blade.php	Allow bulk language update in user edit	2018-01-10 05:33:26 -08:00
confirm-bulk-delete.blade.php	Fixes #4256 - double encoding on user bulk checkin and delete blade	2017-10-19 03:17:55 -07:00
edit.blade.php	Added admin-lte-options file, moved pGenerator to main js file	2018-09-28 17:27:06 -04:00
index.blade.php	Added ability to trigger forgotten password emails for users	2018-07-30 20:31:02 -07:00
ldap.blade.php	More ajax menu fixes	2017-10-28 11:17:52 -07:00
print.blade.php	Fixed #5944 - added logo option for print-assets page (#5950)	2018-07-24 13:37:02 -07:00
view.blade.php	[WIP] Added #5957 - Flysystem support (#6262)	2018-09-29 21:33:52 -07:00