Vladislav Makhov ccab1949d5 Merge branch 'feature/files' 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/store/files/selectors.js		2020-10-16 11:28:31 +03:00
..
ASC.Web.Api	Merge branch 'master' into feature/files	2020-10-13 15:27:31 +03:00
ASC.Web.Client	Web: Client: Removed old loader and toast	2020-10-15 19:28:31 +03:00
ASC.Web.Common	Merge branch 'feature/files' into feature/files-recent	2020-10-16 11:28:31 +03:00
ASC.Web.Components	Merge branch 'feature/files' into feature/files-recent	2020-10-16 11:28:31 +03:00
ASC.Web.Core	Merge branch 'master' into feature/files	2020-10-13 12:52:28 +03:00
ASC.Web.Studio	revert discard	2020-10-12 22:39:23 +03:00