snipe 1b041af862 Merge remote-tracking branch 'origin/master' into develop ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # public/css/build/app.css # public/css/build/overrides.css # public/css/dist/all.css # public/mix-manifest.json		2024-09-29 11:25:01 +01:00
..
bulk-edit.blade.php	Fixed #15504 - allow nulling/not changing locale in user bulk edit	2024-09-16 14:31:10 +01:00
confirm-bulk-delete.blade.php	Updated icons	2024-08-18 17:26:44 +01:00
confirm-merge.blade.php	Updated icons	2024-08-18 17:26:44 +01:00
edit.blade.php	Don’t show password as required if editing	2024-09-28 15:31:44 +01:00
index.blade.php	makes shortcuts optional	2024-08-07 10:47:16 -07:00
ldap.blade.php	allows multi location sync for ldap	2023-11-02 16:50:19 -07:00
print.blade.php	Check for valid eula for license, consumable	2024-09-27 14:07:30 +01:00
view.blade.php	Fixed check for outside assets on user update validation	2024-09-17 15:46:45 +01:00