mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-26 00:29:38 +01:00
resolve conflict
This commit is contained in:
parent
8f6aca7668
commit
f0d23f2bae
@ -25,6 +25,7 @@
|
||||
'deleteaccount',
|
||||
'settings',
|
||||
'sidebox_menu',
|
||||
'personalizer',
|
||||
'preferences',
|
||||
'manual'
|
||||
);
|
||||
|
Loading…
Reference in New Issue
Block a user