AlexeySafronov f42fc72cf9 Merge branch 'master' into develop ... # Conflicts: # products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs # web/ASC.Web.Common/package.json # web/ASC.Web.Components/package.json		2020-12-17 21:03:48 +03:00
..
public	Web: Fixed temp loaders	2020-12-07 11:11:04 +03:00
src	Merge branch 'master' into develop	2020-12-17 21:03:48 +03:00
.env	web: clients: Fixed CRA proxy bug;	2020-02-26 10:02:37 +03:00
.gitignore
analyse.js	Web: People: Added Webpack-bundle-analyzer	2020-08-31 11:59:35 +03:00
config-overrides.js	Web: People: Applied prettier style fix	2020-10-16 16:23:51 +03:00
package.json	Fixed versions (About version)	2020-12-16 19:09:56 +03:00
yarn.lock	Update yarn.lock files	2020-12-17 18:35:04 +03:00