gopienkonikita b088c925d6 Merge branch 'develop' into feature/personal ... # Conflicts: # products/ASC.Files/Client/src/components/dialogs/ConnectDialog/index.js # products/ASC.Files/Client/src/pages/Home/index.js # products/ASC.Files/Client/src/store/FilesStore.js		2021-06-17 15:47:33 +03:00
..
Client	Merge branch 'develop' into feature/personal	2021-06-17 15:47:33 +03:00
Core	Files: fixed subfolders method	2021-06-16 21:53:56 +03:00
Server	RazorCompileOnBuild:false<	2021-06-16 20:08:26 +03:00
Service	RazorCompileOnBuild:false<	2021-06-16 20:08:26 +03:00
Tests	fixed tests	2021-06-15 17:20:53 +03:00