Viktor Fomin 0128b01518 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/two-factor-auth ... # Conflicts: # products/ASC.People/Client/public/locales/en/Profile.json # products/ASC.People/Client/public/locales/ru/Profile.json # products/ASC.People/Client/src/pages/Profile/Section/Body/index.js # web/ASC.Web.Client/public/locales/en/Confirm.json # web/ASC.Web.Client/public/locales/en/Settings.json # web/ASC.Web.Client/public/locales/ru/Confirm.json # web/ASC.Web.Client/public/locales/ru/Settings.json		2021-04-26 15:57:19 +03:00
..
AuthenticationController.cs	Auth: check tfa	2021-04-26 14:56:38 +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	Settings: added tfaapp method	2021-04-25 18:06:56 +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	Merge branch 'develop' into feature/thirdparty-integrations	2020-11-17 12:04:33 +03:00