Vladislav Makhov 967a01061a Merge branch 'develop' into feature/files-recent ... # Conflicts: # products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js # products/ASC.Files/Client/src/components/pages/Home/Section/Body/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 # products/ASC.Files/Client/src/store/files/selectors.js # web/ASC.Web.Common/src/api/files/index.js # web/ASC.Web.Components/src/components/icons/svg/index.js		2020-10-20 09:23:58 +03:00
..
public	Merge branch 'develop' into feature/files-recent	2020-10-20 09:23:58 +03:00
src	Merge branch 'develop' into feature/files-recent	2020-10-20 09:23:58 +03:00
.env
.gitignore
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	Update yarn.lock files	2020-10-16 16:38:11 +03:00