7cfb0dc406
Conflicts: apps/files_encryption/appinfo/app.php apps/files_encryption/lib/util.php |
||
---|---|---|
.. | ||
apps | ||
changedisplayname.php | ||
changepassword.php | ||
creategroup.php | ||
createuser.php | ||
disableapp.php | ||
enableapp.php | ||
getlog.php | ||
lostpassword.php | ||
navigationdetect.php | ||
removegroup.php | ||
removeuser.php | ||
setlanguage.php | ||
setloglevel.php | ||
setquota.php | ||
setsecurity.php | ||
togglegroups.php | ||
togglesubadmins.php | ||
updateapp.php | ||
userlist.php |