Alexey Safronov
9174a20871
# Conflicts: # packages/asc-web-common/api/portal/index.js # packages/asc-web-common/components/Loaders/index.js # packages/asc-web-common/store/SettingsStore.js # packages/asc-web-components/file-input/index.js # packages/asc-web-components/modal-dialog/index.js # packages/asc-web-components/save-cancel-buttons/index.js # products/ASC.Files/Client/src/components/panels/SelectFileDialog/FilesListRow.js # products/ASC.Files/Client/src/components/panels/SelectFileDialog/index.js # products/ASC.Files/Client/src/components/panels/SelectFolderInput/index.js # products/ASC.Files/Client/src/components/panels/StyledPanels.js # products/ASC.Files/Client/src/store/ContextOptionsStore.js # public/locales/de/Common.json # web/ASC.Web.Client/public/locales/en/Settings.json # web/ASC.Web.Client/public/locales/ru/Settings.json # web/ASC.Web.Client/src/Shell.jsx # web/ASC.Web.Client/src/components/NavMenu/index.js # web/ASC.Web.Client/src/components/NavMenu/sub-components/header.js # web/ASC.Web.Client/src/components/pages/Settings/Layout/Article/Body/index.js # web/ASC.Web.Client/src/components/pages/Settings/categories/common/customization.js # web/ASC.Web.Client/src/components/pages/Settings/categories/security/access-portal.js # web/ASC.Web.Client/src/components/pages/Settings/categories/security/access-rights.js # web/ASC.Web.Client/webpack.config.js # web/ASC.Web.Editor/src/Editor.jsx |
||
---|---|---|
.. | ||
index.js |