pavelbannov 02f39a9c71 Merge branch 'master' into feature/files ... # Conflicts: # common/ASC.Core.Common/Migrations/MySql/WebstudioDbContextMySql/20201006101804_WebstudioDbContextMySql.cs # common/ASC.Core.Common/Migrations/Npgsql/WebstudioDbContextNpgsql/20200929102646_WebstudioDbContextNpgsql.cs # products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs # products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs # products/ASC.Files/Core/Core/FileStorageService.cs # web/ASC.Web.Core/Files/FileUtility.cs		2020-10-13 12:52:28 +03:00
..
Core	fix-messages: IDE0051 and IDE0052	2020-09-29 11:57:37 +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	revert discard	2020-10-12 22:39:23 +03:00
search.json	fix	2020-07-16 16:02:21 +03:00