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
..
general.php	Merge branch 'develop' of github.com:snipe/snipe-it into develop	2017-03-10 20:07:49 -08:00
message.php	Fixes #3085 - adds “change password” functionality back to user accounts	2017-08-22 12:09:04 -07:00
table.php	Add a manager field to locations.	2017-06-12 18:23:50 -05:00