snipe 40615f9504 Merge branch 'develop' of github.com:snipe/snipe-it into develop ... # Conflicts: # app/Http/Controllers/StatuslabelsController.php		2016-12-23 17:53:03 -08:00
..
Controllers	Merge branch 'develop' of github.com:snipe/snipe-it into develop	2016-12-23 17:53:03 -08:00
Middleware	Use url() helper over URL::to	2016-12-15 16:41:36 -08:00
Requests	Update validation in AssetRequest form request	2016-12-15 15:24:55 -08:00
Traits	Putting uniqueUndeleted into a trait for use across models	2016-07-26 01:39:30 -07:00
Kernel.php	Discussion: Moving to policies for controller based authorization (#3080)	2016-12-19 11:04:28 -08:00