Vladislav Makhov 3415cc046c Merge branch 'develop' into feature/desktop-view ... # Conflicts: # web/ASC.Web.Common/src/store/auth/reducer.js # web/ASC.Web.Common/src/store/auth/selectors.js		2020-11-10 11:02:14 +03:00
..
public	Web: Fixed PWA App icon url on iOS	2020-11-02 21:42:53 +03:00
src	Merge branch 'develop' into feature/desktop-view	2020-11-10 11:02:14 +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	yarn.lock update	2020-11-03 17:39:49 +03:00