pavelbannov 2782d9f64c Merge branch 'master' into feature/ef ... # Conflicts: # common/ASC.VoipService/Dao/CachedVoipDao.cs # common/ASC.VoipService/Dao/VoipDao.cs # web/ASC.Web.Api/Controllers/SettingsController.cs		2019-12-23 16:25:33 +03:00
..
AuthenticationController.cs	Auth: set cookie on server	2019-11-12 14:46:58 +03:00
LdapController.cs	Api: added settings controller	2019-08-12 13:53:12 +03:00
ModulesController.cs	DI: refactoring. Web.Api	2019-10-31 16:54:43 +03:00
PortalController.cs	Consumers: added config	2019-12-20 14:17:01 +03:00
SettingsController.cs	Merge branch 'master' into feature/ef	2019-12-23 16:25:33 +03:00
SmtpSettingsController.cs	Renamed all "*factory" classes to "*Extension"	2019-11-11 12:03:49 +03:00
SsoSettingsV2Controller.cs	Api: added settings controller	2019-08-12 13:53:12 +03:00