Viktor Fomin 0656725149 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/two-factor-auth ... # Conflicts: # products/ASC.People/Client/src/pages/Profile/Section/Body/index.js # web/ASC.Web.Client/src/components/pages/Confirm/index.js		2021-04-28 11:20:32 +03:00
..
AuthenticationController.cs	Auth: AuthenticateMe added ConfirmUrl	2021-04-27 13:40:25 +03:00
CapabilitiesController.cs	Autofac: fix	2020-11-02 19:27:08 +03:00
LdapController.cs	Api: added settings controller	2019-08-12 13:53:12 +03:00
ModulesController.cs	Api: modules. Added info method	2021-01-25 17:37:26 +03:00
PortalController.cs	Fix getshortenlink	2021-03-21 18:29:35 +03:00
SecurityController.cs	Merge branch 'develop' into refactoring/scope	2020-11-13 16:03:17 +03:00
SettingsController.cs	Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/two-factor-auth	2021-04-28 11:20:32 +03:00
SmtpSettingsController.cs	Merge branch 'develop' into refactoring/scope	2020-11-13 16:03:17 +03:00
SsoSettingsV2Controller.cs	Api: added settings controller	2019-08-12 13:53:12 +03:00
ThirdPartyController.cs	Thirdparty: fix providers	2021-04-26 21:42:39 +03:00