snipe d8eb68af83 Merge branch 'hotfixes/accessory_model_number' into develop ... # Conflicts: # resources/views/accessories/edit.blade.php		2016-11-17 20:01:01 -08:00
..
checkin.blade.php	Version 3 - hold onto your butts	2016-03-25 01:18:05 -07:00
checkout.blade.php	Version 3 - hold onto your butts	2016-03-25 01:18:05 -07:00
edit.blade.php	Add accessory model to accessories	2016-11-17 20:00:08 -08:00
index.blade.php	Merge branch 'hotfixes/accessory_model_number' into develop	2016-11-17 20:01:01 -08:00
view.blade.php	Merge branch 'hotfixes/accessory_model_number' into develop	2016-11-17 20:01:01 -08:00