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
..
bulk-edit.blade.php	Added dept to user edit/create/bulk edit views	2017-05-23 02:51:09 -07:00
confirm-bulk-delete.blade.php	Switched to presented for ugly BS table column headers	2017-02-03 22:20:11 -08:00
edit.blade.php	Fixes #3652 - missing groups UI element in user edit view	2017-06-09 12:19:12 -07:00
import.blade.php	Reformat all view files. (#3105)	2016-12-27 12:03:47 -08:00
index.blade.php	Fixes #3873 - show groups correctly on user listing page	2017-08-22 12:29:46 -07:00
ldap.blade.php	Fixes #3648 - missing endif in blade	2017-06-08 16:16:49 -07:00
view.blade.php	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