pavelbannov 2c1d473314 Merge branch 'master' into feature/files ... # Conflicts: # 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 # products/ASC.Files/Server/Controllers/FilesController.cs		2020-09-28 12:29:33 +03:00
..
Controllers	Merge branch 'master' into feature/files	2020-09-28 12:29:33 +03:00
Core	moved from release/11 4414f77b	2020-09-18 17:45:59 +03:00
Models	Merge branch 'master' into feature/release-11.0.0	2020-09-20 20:17:12 +03:00
Properties	Common nlog config	2019-11-15 11:47:56 +03:00
appsettings.json	External config	2019-06-21 11:03:42 +03:00
ASC.Web.Api.csproj	encryption: add api start	2020-09-17 16:56:12 +03:00
ASC.Web.Api.sln	init commit	2019-05-15 17:56:09 +03:00
Program.cs	general-startup: fix	2020-07-03 18:57:59 +03:00
Startup.cs	Added sendjoininvite, sendadmmail	2020-07-24 17:01:20 +03:00