mirror of
https://github.com/snipe/snipe-it.git
synced 2024-12-24 21:24:13 -08:00
08f3e78d26
# 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 |
||
---|---|---|
.. | ||
bulk-edit.blade.php | ||
confirm-bulk-delete.blade.php | ||
edit.blade.php | ||
import.blade.php | ||
index.blade.php | ||
ldap.blade.php | ||
view.blade.php |