Vladislav Makhov 2757a785a0 Merge branch 'develop' into feature/files-favorites ... # Conflicts: # products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRowContent.js # web/ASC.Web.Common/src/api/files/index.js		2020-10-19 17:54:41 +03:00
..
public	Merge branch 'feature/files' into feature/files-favorites	2020-10-14 13:45:13 +03:00
src	Merge branch 'develop' into feature/files-favorites	2020-10-19 17:54:41 +03:00
.env	web: files: Fixed proxy configure for images and socketjs	2020-02-26 11:04:26 +03:00
.gitignore	Files: Init Files.Client	2020-02-25 09:58:09 +03:00
analyse.js	Web: Files: Added Webpack-bundle-analyzer	2020-08-31 12:07:58 +03:00
config-overrides.js	Web: Files: Applied prettier style fix	2020-10-16 16:27:22 +03:00
package.json	Web: Files: Applied prettier style fix	2020-10-16 16:27:22 +03:00
yarn.lock	Update yarn.lock files	2020-10-16 16:38:11 +03:00