Vladislav Makhov 79989f7bf4 Merge branch 'develop' into feature/desktop-view ... # Conflicts: # products/ASC.Files/Client/src/components/Article/MainButton/index.js # products/ASC.Files/Client/src/components/pages/Home/locales/en/translation.json # products/ASC.Files/Client/src/components/pages/Home/locales/ru/translation.json # web/ASC.Web.Common/src/store/auth/actions.js		2020-12-24 10:21:02 +03:00
..
public	Merge branch 'develop' into feature/desktop-view	2020-12-24 10:21:02 +03:00
src	Merge branch 'develop' into feature/desktop-view	2020-12-24 10:21:02 +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	Bump version to v0.0.4	2020-12-17 21:00:36 +03:00
yarn.lock	Update yarn.lock files	2020-12-23 12:43:27 +03:00