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
..
Controllers	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
Middleware	Formatting fixes for coding standards	2016-06-22 12:27:41 -07:00
Requests	Validate that purchase_cost is a numeric value. (#2452)	2016-08-16 18:18:50 -07:00
Traits	Putting uniqueUndeleted into a trait for use across models	2016-07-26 01:39:30 -07:00
Kernel.php	Use custom maintenance middleware	2016-08-11 19:22:26 -07:00
routes.php	Add manufacturer to licenses (#2436)	2016-08-16 18:49:54 -07:00