mirror of
https://github.com/snipe/snipe-it.git
synced 2026-02-05 23:35:54 +00:00
# Conflicts: # app/Http/Controllers/ConsumablesController.php # app/Http/Controllers/LicensesController.php # resources/views/hardware/view.blade.php