gopienkonikita 0231e60cc7 Merge branch 'master' into feature/files ... # Conflicts: # web/ASC.Web.Components/package.json # web/ASC.Web.Components/src/components/icons/svg/index.js # web/ASC.Web.Components/src/index.js		2020-07-28 17:34:46 +03:00
..
Core	Files: feed. FoldersModule	2020-06-04 19:36:43 +03:00
Properties	FileService: bat and launchSettings	2020-05-08 11:35:04 +03:00
appsettings.json	Files: service replaced	2020-04-27 20:02:15 +03:00
ASC.Files.Service.csproj	Merge branch 'master' into feature/files	2020-07-28 17:34:46 +03:00
feed.json	Files: feed. FoldersModule	2020-06-04 19:36:43 +03:00
Program.cs	Merge branch 'master' into feature/feed	2020-06-05 11:46:12 +03:00
search.json	fix	2020-07-16 16:02:21 +03:00