Web: Files: fix merge
This commit is contained in:
parent
5489d74b27
commit
ebaf9ccecd
@ -95,7 +95,9 @@ class App extends React.Component {
|
||||
getPortalSettings(),
|
||||
getModules(),
|
||||
getPortalCultures(),
|
||||
fetchTreeFolders()
|
||||
fetchTreeFolders(),
|
||||
fetchThirdPartyCapabilities(),
|
||||
fetchThirdPartyProviders()
|
||||
);
|
||||
if (isDesktop) {
|
||||
requests.push(getIsEncryptionSupport(), getEncryptionKeys());
|
||||
|
Loading…
Reference in New Issue
Block a user