Skip to content

A free open source IT asset/license management system

Merge branch 'develop' into features/18554-component-report

snipe06b1f02be60a
diff --cc routes/web.php
index 7d074628ca,181c9d3149..04777c8e25
--- a/routes/web.php
+++ b/routes/web.php
@@@ -22,7 -22,7 +22,8 @@@ use App\Http\Controllers\ManufacturersC
use App\Http\Controllers\ModalController;
use App\Http\Controllers\NotesController;
use App\Http\Controllers\ProfileController;
+use App\Http\Controllers\Reports\CustomComponentReportController;
+ use App\Http\Controllers\QrCodeController;
use App\Http\Controllers\ReportsController;
use App\Http\Controllers\ReportTemplatesController;
use App\Http\Controllers\SettingsController;