Web: Files: fix merge

This commit is contained in:
Nikita Gopienko 2021-01-11 13:24:07 +03:00
parent 5489d74b27
commit ebaf9ccecd

View File

@ -95,7 +95,9 @@ class App extends React.Component {
getPortalSettings(), getPortalSettings(),
getModules(), getModules(),
getPortalCultures(), getPortalCultures(),
fetchTreeFolders() fetchTreeFolders(),
fetchThirdPartyCapabilities(),
fetchThirdPartyProviders()
); );
if (isDesktop) { if (isDesktop) {
requests.push(getIsEncryptionSupport(), getEncryptionKeys()); requests.push(getIsEncryptionSupport(), getEncryptionKeys());