Artem Tarasov 43491f42a9 Merge branch 'develop' into feature/thumbnails ... # Conflicts: # products/ASC.Files/Client/src/Files.jsx # products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesContent.js # products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRow/FilesRowContainer.js # products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRow/SimpleFilesRow.js # products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesTileContent.js # products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js # products/ASC.Files/Client/src/store/InitFilesStore.js		2021-04-05 10:54:27 +03:00
..
public	Merge branch 'develop' into feature/EditorIntegration	2021-04-01 10:17:14 +03:00
src	Merge branch 'develop' into feature/thumbnails	2021-04-05 10:54:27 +03:00
.babelrc	Web: Editor: Optimization	2021-03-06 18:50:06 +03:00
.env
.gitignore
analyse.js
Dockerfile	Web: Files: init Files build and loading (Moved out from CRA)	2020-12-07 10:49:07 +03:00
package.json	Web: Moved sw-template to @appserver/common and removed api cache (translation issue)	2021-03-24 11:45:58 +03:00
webpack.config.js	Web: Files/Editor: Added SharingDialog.	2021-03-31 16:49:14 +03:00