Viktor Fomin
b7ce4a35e7
# Conflicts: # products/ASC.Files/Server/DocStore # web/ASC.Web.Client/public/locales/en/Settings.json # web/ASC.Web.Client/public/locales/ru/Settings.json # web/ASC.Web.Client/src/components/pages/Settings/categories/security/sub-components/admins.js # web/ASC.Web.Client/src/components/pages/Settings/index.js |
||
---|---|---|
.. | ||
files | ||
groups | ||
modules | ||
people | ||
portal | ||
settings | ||
user | ||
client.js | ||
index.js |