pavelbannov 29d9f21d05 Merge branch 'master' into feature/files ... # Conflicts: # products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs # web/ASC.Web.Core/Files/DocumentService.cs		2020-08-31 17:45:57 +03:00
..
AuthenticationController.cs	Merge branch 'master' into feature/private	2020-08-14 17:19:36 +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	private: firtst version	2020-08-12 12:58:08 +03:00
SettingsController.cs	Merge branch 'master' into feature/files	2020-08-31 17:45:57 +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