AlexeySafronov c8f7555017 Merge branch 'develop' into bugfix/sharing-settings ... # Conflicts: # products/ASC.Files/Client/src/store/files/actions.js # products/ASC.Files/Client/yarn.lock # products/ASC.People/Client/yarn.lock # web/ASC.Web.Client/yarn.lock # web/ASC.Web.Common/yarn.lock # web/ASC.Web.Components/yarn.lock		2020-12-08 18:06:31 +03:00
..
public	Web: Fixed temp loaders	2020-12-07 11:11:04 +03:00
src	Merge branch 'develop' into bugfix/sharing-settings	2020-12-08 18:06:31 +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: Added fast-deep-equal	2020-12-08 14:08:26 +03:00
yarn.lock	Update yarn.lock files	2020-12-08 15:26:54 +03:00