snipe 4419dc7434 Merge branch 'fix-double-format' of https://github.com/dmeltzer/snipe-it into dmeltzer-fix-double-format ... # Conflicts: # app/Http/Controllers/ConsumablesController.php # app/Http/Controllers/LicensesController.php # resources/views/hardware/view.blade.php		2016-08-16 18:53:45 -07: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	Merge branch 'fix-double-format' of https://github.com/dmeltzer/snipe-it into dmeltzer-fix-double-format	2016-08-16 18:53:45 -07:00
index.blade.php	Add manufacturer to licenses (#2436)	2016-08-16 18:49:54 -07:00
view.blade.php	Fixes #2363 and #1097	2016-08-02 00:54:38 -07:00