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
..
Controllers	Merge branch 'master' into feature/files	2020-10-13 12:52:28 +03:00
DocStore	Files: core. replace	2020-07-28 15:45:14 +03:00
Helpers	Merge branch 'master' into feature/files	2020-10-13 12:52:28 +03:00
Properties	Files: Startup	2020-02-12 13:48:58 +03:00
appsettings.json	Files: Startup	2020-02-12 13:48:58 +03:00
ASC.Files.csproj	Merge branch 'master' into feature/files	2020-10-08 19:01:09 +03:00
ProductEntryPoint.cs	DI: refactoring	2020-07-17 13:52:28 +03:00
Program.cs	revert discard	2020-10-12 22:39:23 +03:00
Startup.cs	Merge branch 'master' into feature/files	2020-10-13 12:52:28 +03:00