fixed some rebase conflicts

This commit is contained in:
Tobias Kolzer
2024-06-21 01:11:36 +02:00
committed by knom
parent b90b38eae9
commit c56ffe1d1e
10 changed files with 125 additions and 23 deletions
+1
View File
@@ -114,4 +114,5 @@ return array (
'alert.success.user_restored' => 'User restored successfully',
'dashboard.reorder' => 'Reorder and pin items',
'dashboard.settings' => 'Settings',
'role' => 'Authentification role',
);