AlexeySafronov a31dc583c1 Merge branch 'develop' into feature/personal ... # Conflicts: # products/ASC.Files/Client/src/HOCs/withFileActions.js # products/ASC.Files/Client/src/components/panels/SharingPanel/index.js # products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js # products/ASC.Files/Client/src/pages/Settings/index.js		2021-07-02 16:26:45 +03:00
..
Client	Merge branch 'develop' into feature/personal	2021-07-02 16:26:45 +03:00
Server	RazorCompileOnBuild:false<	2021-06-16 20:08:26 +03:00