snipe d87da78eb5 Merge remote-tracking branch 'origin/develop' ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # app/Http/Controllers/Users/UsersController.php # config/version.php # public/css/build/AdminLTE.css # public/css/build/app.css # public/css/build/overrides.css # public/css/dist/all.css # public/css/dist/bootstrap-table.css # public/js/build/app.js # public/js/build/vendor.js # public/js/dist/all-defer.js # public/js/dist/all.js # public/js/dist/bootstrap-table.js # public/mix-manifest.json		2024-06-17 11:18:33 +01:00
..
Controllers	Merge remote-tracking branch 'origin/develop'	2024-06-17 11:18:33 +01:00
Livewire	Pull the log reference	2024-06-05 10:28:35 +01:00
Middleware	Cleaned up facade names and references	2024-05-29 12:38:15 +01:00
Requests	Merge pull request #14698 from Scarzy/features/asset_file_upload_from_api	2024-06-12 11:18:06 +01:00
Traits	Cleaned up facade names and references	2024-05-29 12:38:15 +01:00
Transformers	Merge remote-tracking branch 'origin/develop'	2024-06-17 11:18:33 +01:00
Kernel.php	Porting Snipe-IT v7 to Laravel v10	2023-07-31 14:07:12 +01:00