yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/v15/dev' into v14/feature/POC-dynamic-global-manifest-types

Browse Source 
# Conflicts:
#	src/packages/user/user/manifests.ts
This commit is contained in:
Niels Lyngsø
2024-09-13 10:44:06 +02:00
parent 1e729a6ba9 46c1164aa9
commit a7a0c1b779
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Umbraco.Web.UI.Client/src/packages/user/user/manifests.ts
View File

@@ -9,9 +9,9 @@ import { manifests as propertyEditorManifests } from './property-editor/manifest
import { manifests as repositoryManifests } from './repository/manifests.js';
import { manifests as workspaceManifests } from './workspace/manifests.js';
import { manifests as menuItemManifests } from './menu-item/manifests.js';
import type { UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry';
import type { ManifestTypes, UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry';
export const manifests: Array<UmbManifestTypes | UmbBackofficeManifestKind> = [
export const manifests: Array<ManifestTypes | UmbBackofficeManifestKind> = [
...clientCredentialManifests,
...collectionManifests,
...conditionsManifests,