pavelbannov 15ba6828c5 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		2020-08-20 12:43:12 +03:00
..
Controllers	Merge branch 'master' into feature/files	2020-08-20 12:43:12 +03:00
Core	Settings: added license/required and license upload	2020-08-03 16:42:59 +03:00
Models	Merge branch 'master' into feature/private	2020-08-14 17:19:36 +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	Merge branch 'master' into feature/Wizard	2020-07-15 15:23:28 +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