mirror of
https://github.com/snipe/snipe-it.git
synced 2025-03-05 20:52:15 -08:00
# Conflicts: # app/Http/Controllers/ReportsController.php # resources/views/partials/forms/edit/category-select.blade.php # resources/views/partials/forms/edit/company-select.blade.php # resources/views/partials/forms/edit/location-select.blade.php # resources/views/partials/forms/edit/manufacturer-select.blade.php # resources/views/partials/forms/edit/model-select.blade.php # resources/views/partials/forms/edit/status-select.blade.php # resources/views/reports/custom.blade.php |
||
---|---|---|
.. | ||
Accessories | ||
AssetModels | ||
Assets | ||
Categories | ||
Checkins | ||
CheckoutAcceptances/Ui | ||
Checkouts | ||
Companies/Ui | ||
Components | ||
Console | ||
Consumables | ||
Departments | ||
Depreciations | ||
Groups | ||
Licenses | ||
Livewire | ||
Locations | ||
Notifications | ||
Reporting | ||
ReportTemplates | ||
Settings | ||
Users | ||
DashboardTest.php |