Alexey Safronov 9174a20871 Merge branch 'develop' into feature/virtual-rooms-1.2 ... # 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		2022-03-24 14:39:52 +03:00
..
az	Merge branch 'develop' into feature/virtual-rooms-1.2	2022-03-24 14:39:52 +03:00
bg	Merge branch 'develop' into feature/virtual-rooms-1.2	2022-03-24 14:39:52 +03:00
cs	Merge branch 'develop' into feature/virtual-rooms-1.2	2022-03-24 14:39:52 +03:00
de	Merge branch 'develop' into feature/virtual-rooms-1.2	2022-03-24 14:39:52 +03:00
el	Merge branch 'develop' into feature/virtual-rooms-1.2	2022-03-24 14:39:52 +03:00
en	Merge branch 'develop' into feature/virtual-rooms-1.2	2022-03-24 14:39:52 +03:00
es	Merge branch 'develop' into feature/virtual-rooms-1.2	2022-03-24 14:39:52 +03:00
fi	Merge branch 'develop' into feature/virtual-rooms-1.2	2022-03-24 14:39:52 +03:00
fr	Merge branch 'develop' into feature/virtual-rooms-1.2	2022-03-24 14:39:52 +03:00
it	Merge branch 'develop' into feature/virtual-rooms-1.2	2022-03-24 14:39:52 +03:00
ja	Merge branch 'develop' into feature/virtual-rooms-1.2	2022-03-24 14:39:52 +03:00
ko	Merge branch 'develop' into feature/virtual-rooms-1.2	2022-03-24 14:39:52 +03:00
lo	Merge branch 'develop' into feature/virtual-rooms-1.2	2022-03-24 14:39:52 +03:00
lv	Merge branch 'develop' into feature/virtual-rooms-1.2	2022-03-24 14:39:52 +03:00
nl	Merge branch 'develop' into feature/virtual-rooms-1.2	2022-03-24 14:39:52 +03:00
pl	Merge branch 'develop' into feature/virtual-rooms-1.2	2022-03-24 14:39:52 +03:00
pt	Merge branch 'develop' into feature/virtual-rooms-1.2	2022-03-24 14:39:52 +03:00
pt-BR	Merge branch 'develop' into feature/virtual-rooms-1.2	2022-03-24 14:39:52 +03:00
ro	Merge branch 'develop' into feature/virtual-rooms-1.2	2022-03-24 14:39:52 +03:00
ru	Merge branch 'develop' into feature/virtual-rooms-1.2	2022-03-24 14:39:52 +03:00
sk	Merge branch 'develop' into feature/virtual-rooms-1.2	2022-03-24 14:39:52 +03:00
sl	Merge branch 'develop' into feature/virtual-rooms-1.2	2022-03-24 14:39:52 +03:00
tr	Merge branch 'develop' into feature/virtual-rooms-1.2	2022-03-24 14:39:52 +03:00
uk	Merge branch 'develop' into feature/virtual-rooms-1.2	2022-03-24 14:39:52 +03:00
vi	Merge branch 'develop' into feature/virtual-rooms-1.2	2022-03-24 14:39:52 +03:00
zh-CN	Merge branch 'develop' into feature/virtual-rooms-1.2	2022-03-24 14:39:52 +03:00