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
..
assets	Merge branch 'develop' into snipeit_v7_laravel10	2024-05-20 12:55:29 +01:00
lang	Merge remote-tracking branch 'origin/develop'	2024-06-17 11:18:33 +01:00
macros	Wider country dropdown	2024-03-20 11:00:06 +00:00
views	Merge pull request #14800 from snipe/fixes/importer_tweaks	2024-06-12 12:51:11 +01:00