mirror of
https://github.com/snipe/snipe-it.git
synced 2024-11-10 15:44:11 -08:00
4419dc7434
# Conflicts: # app/Http/Controllers/ConsumablesController.php # app/Http/Controllers/LicensesController.php # resources/views/hardware/view.blade.php |
||
---|---|---|
.. | ||
checkin.blade.php | ||
checkout.blade.php | ||
edit.blade.php | ||
index.blade.php | ||
view.blade.php |