gopienkonikita c7c9225923 Merge branch 'develop' into feature/thirdparty-integrations ... # Conflicts: # products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js # products/ASC.Files/Client/src/components/dialogs/DeleteDialog/index.js # products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRowContent.js # products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js # products/ASC.Files/Client/src/components/pages/Home/Section/Header/index.js # products/ASC.Files/Client/src/components/pages/Home/locales/en/translation.json # products/ASC.Files/Client/src/components/pages/Home/locales/ru/translation.json # products/ASC.Files/Client/src/components/panels/NewFilesPanel/index.js # products/ASC.Files/Client/src/store/files/selectors.js		2021-01-11 12:37:31 +03:00
..
AuthenticationController.cs	Auth. ia auth: allow anonymous	2020-12-01 16:40: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	Scope: refactoring	2020-10-19 18:53:15 +03:00
PortalController.cs	moved from 2e37dcd0	2020-12-28 16:22:08 +03:00
SecurityController.cs	Merge branch 'develop' into refactoring/scope	2020-11-13 16:03:17 +03:00
SettingsController.cs	moved from 2e37dcd0	2020-12-28 16:22:08 +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