snipe 08f3e78d26 Merge branch 'checkout-to-location-v2' of https://github.com/dmeltzer/snipe-it into dmeltzer-checkout-to-location-v2 ... # Conflicts: # app/Http/Controllers/Api/UsersController.php # app/Http/Transformers/LocationsTransformer.php # resources/views/locations/view.blade.php # routes/api.php # tests/_data/dump.sql		2017-08-25 06:04:22 -07:00
..
Controllers	Merge branch 'checkout-to-location-v2' of https://github.com/dmeltzer/snipe-it into dmeltzer-checkout-to-location-v2	2017-08-25 06:04:22 -07:00
Middleware	Small phpcbf cleanup	2016-12-29 14:02:18 -08:00
Requests	Fixes for API calls for password complexity stuff	2017-08-22 21:15:35 -07:00
Traits	Putting uniqueUndeleted into a trait for use across models	2016-07-26 01:39:30 -07:00
Transformers	Merge branch 'checkout-to-location-v2' of https://github.com/dmeltzer/snipe-it into dmeltzer-checkout-to-location-v2	2017-08-25 06:04:22 -07:00
Kernel.php	Updated auth:api in kernel	2017-01-11 14:54:11 -08:00