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
..
factories	Fixes settings problem in unit tests	2017-08-25 03:40:56 -07:00
migrations	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
seeds	[WIP] Improvements to unit tests. (#3574)	2017-06-12 17:39:03 -07:00
.gitignore	Version 3 - hold onto your butts	2016-03-25 01:18:05 -07:00