pavelbannov 3ca0990715 Merge branch 'master' into feature/files ... # Conflicts: # common/ASC.Core.Common/EF/Model/FilesConverts.cs # products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs # products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs		2020-10-08 19:01:09 +03:00
..
Controllers	Merge branch 'master' into feature/files	2020-10-08 19:01:09 +03:00
DocStore	Files: core. replace	2020-07-28 15:45:14 +03:00
Helpers	Merge branch 'master' into feature/files	2020-10-08 19:01:09 +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	Startup: added command line	2020-06-04 16:26:31 +03:00
Startup.cs	Merge branch 'master' into feature/files	2020-10-08 19:01:09 +03:00