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
..
AccessoryObserver.php	Cleaned up facade names and references	2024-05-29 12:38:15 +01:00
AssetObserver.php	Merge remote-tracking branch 'origin/develop'	2024-06-17 11:18:33 +01:00
ComponentObserver.php	Cleaned up facade names and references	2024-05-29 12:38:15 +01:00
ConsumableObserver.php	Cleaned up facade names and references	2024-05-29 12:38:15 +01:00
LicenseObserver.php	Cleaned up facade names and references	2024-05-29 12:38:15 +01:00
SettingObserver.php	Remove old cache key for settings	2023-01-09 16:19:25 -08:00
UserObserver.php	Cleaned up facade names and references	2024-05-29 12:38:15 +01:00