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
..
AuthenticationController.cs	Api: moved from release/11 4414f77b	2020-09-17 15:04:28 +03:00
LdapController.cs	Api: added settings controller	2019-08-12 13:53:12 +03:00
ModulesController.cs	private: firtst version	2020-08-12 12:58:08 +03:00
PortalController.cs	moved from release/11 4414f77b	2020-09-18 17:45:59 +03:00
SettingsController.cs	Merge branch 'master' into feature/files	2020-09-28 12:29:33 +03:00
SmtpSettingsController.cs	private: firtst version	2020-08-12 12:58:08 +03:00
SsoSettingsV2Controller.cs	Api: added settings controller	2019-08-12 13:53:12 +03:00