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
..
BulkUsersController.php	Cleaned up facade names and references	2024-05-29 12:38:15 +01:00
LDAPImportController.php	allows multi location sync for ldap	2023-11-02 16:50:19 -07:00
UserFilesController.php	Fiddled with storage facade a little more	2024-05-22 17:44:49 +01:00
UsersController.php	Merge remote-tracking branch 'origin/develop'	2024-06-17 11:18:33 +01:00