DocSpace-client/public
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
..
fonts Fix Bug 51344 "downloadable font: kern: Too large subtable..." on FF 2021-07-27 15:56:19 +03:00
images Merge branch 'develop' into feature/virtual-rooms-1.2 2022-03-24 14:39:52 +03:00
locales Merge branch 'develop' into feature/virtual-rooms-1.2 2022-03-24 14:39:52 +03:00
offline Web: Removed duplicates 2021-09-24 21:18:50 +03:00
scripts Web: added tiff script 2021-08-19 13:27:44 +03:00
thirdparty Web: Fixed callback pages, added login callback for desktop client 2021-10-19 10:31:34 +03:00
appIcon.png PWA: renamed images for pwa 2019-12-11 15:18:55 +03:00
bg-error.png PWA: renamed images for pwa 2019-12-11 15:18:55 +03:00
favicon.ico Web: Removed duplicates 2021-09-24 21:18:50 +03:00
manifest.json PWA: renamed images for pwa 2019-12-11 15:18:55 +03:00