snipe dc3af7cc74 Resolved conflicts ... Signed-off-by: snipe <snipe@snipe.net>		2021-10-04 20:39:24 -07:00
..
audit-due.blade.php
audit-overdue.blade.php
audit.blade.php
bulk-checkout.blade.php
bulk-delete.blade.php
bulk.blade.php	Fix ID array	2021-10-04 17:18:07 -07:00
checkin.blade.php
checkout.blade.php	Fixed #9082 - allow deployable status type on checkout	2021-02-03 01:29:54 -08:00
edit.blade.php	Update edit.blade.php (#8876)	2021-02-03 11:59:05 -08:00
history.blade.php	Fixed #9424: import history adds asset model to assigned user and respects checkin date (#9350)	2021-04-20 21:25:17 -07:00
index.blade.php	Handle bulk check and uncheck	2021-10-04 17:58:16 -07:00
labels.blade.php	Manually re-add support for Label Logos in Labels (#9552)	2021-05-07 17:01:32 -07:00
quickscan.blade.php	Fixed weird layout on bulk audit [ch17146]	2021-08-18 01:05:09 -07:00
requested.blade.php	Fixed #8585 - requested assets page blank	2020-10-22 20:08:33 -07:00
view.blade.php	Resolved conflicts	2021-10-04 20:39:24 -07:00