Vladislav Makhov 2476b306f9 Merge branch 'feature/files' into feature/files-recent ... # Conflicts: # web/ASC.Web.Common/src/api/files/index.js # web/ASC.Web.Components/package.json		2020-10-12 10:04:24 +03:00
..
public	Merge branch 'feature/files' into feature/files-recent	2020-10-12 10:04:24 +03:00
src	Merge branch 'feature/files' into feature/files-recent	2020-10-12 10:04:24 +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	Files: Init Files.Client	2020-02-25 09:58:09 +03:00
package.json	Web: Re-written NavMenu with selectors and reselect	2020-10-01 01:25:08 +03:00
yarn.lock	Web: People: Added hack for build machine only	2020-10-09 19:14:48 +03:00