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
..
Console	Fixed #14812 - added consumables to individual inventory report	2024-06-05 20:40:45 +01:00
Events	Track changes on asset checkin/out	2023-09-01 13:12:07 +10:00
Exceptions	Cleaned up facade names and references	2024-05-29 12:38:15 +01:00
Helpers	Put session facade back - derp	2024-05-30 14:15:08 +01:00
Http	Merge remote-tracking branch 'origin/develop'	2024-06-17 11:18:33 +01:00
Importer	Fixed variable name, $field	2024-06-05 10:28:35 +01:00
Jobs
LegacyEncrypter
Listeners	Cleaned up facade names and references	2024-05-29 12:38:15 +01:00
Models	Merge remote-tracking branch 'origin/develop'	2024-06-17 11:18:33 +01:00
Notifications	Fixed #14812 - added consumables to individual inventory report	2024-06-05 20:40:45 +01:00
Observers	Merge remote-tracking branch 'origin/develop'	2024-06-17 11:18:33 +01:00
Policies	Fixed tests	2024-04-17 09:26:07 +01:00
Presenters	Used localized strings	2024-05-07 17:56:07 +01:00
Providers	Cleaned up facade names and references	2024-05-29 12:38:15 +01:00
Services	Cleaned up facade names and references	2024-05-29 12:38:15 +01:00
View	Add comment	2024-04-11 17:23:28 -07:00