Artem Tarasov 43b9301e90 Merge branch 'develop' into feature/thumbnails ... # Conflicts: # products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRow/SimpleFilesRow.js # products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesTile/FilesTileContainer.js # products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js # products/ASC.Files/Client/src/store/FilesActionsStore.js		2021-04-01 18:19:09 +03:00
..
Client	Merge branch 'develop' into feature/thumbnails	2021-04-01 18:19:09 +03:00
Core	Files: fix finding template when saving file, hat doesn't have template	2021-04-01 16:32:10 +03:00
Server	Merge branch 'develop' into feature/dotnet5	2021-03-31 20:38:05 +03:00
Service	Merge branch 'develop' into feature/dotnet5	2021-03-25 21:50:09 +03:00
Tests	Sln: fixed packages	2021-03-26 12:26:12 +03:00