gopienkonikita 513ec04e33 Merge branch 'develop' into feature/translations-loaders ... # Conflicts: # products/ASC.Files/Client/src/components/dialogs/DeleteDialog/index.js # products/ASC.Files/Client/src/components/panels/SharingPanel/index.js # products/ASC.People/Client/src/components/Article/MainButton/index.js # products/ASC.People/Client/src/pages/Home/Section/Header/index.js		2021-07-01 16:47:34 +03:00
..
Client	Merge branch 'develop' into feature/translations-loaders	2021-07-01 16:47:34 +03:00
Server	RazorCompileOnBuild:false<	2021-06-16 20:08:26 +03:00