mirror of https://github.com/Squidex/squidex.git
Browse Source
# Conflicts: # frontend/src/app/features/apps/pages/onboarding-dialog.component.html # frontend/src/app/features/assets/pages/asset-tags.component.html # frontend/src/app/features/content/pages/content/content-event.component.html # frontend/src/app/features/content/pages/content/content-history-page.component.html # frontend/src/app/features/content/pages/content/content-page.component.html # frontend/src/app/features/content/pages/content/editor/content-editor.component.html # frontend/src/app/features/content/pages/content/inspecting/content-inspection.component.html # frontend/src/app/features/content/shared/forms/array-editor.component.html # frontend/src/app/features/content/shared/forms/component.component.html # frontend/src/app/features/content/shared/list/content.component.html # frontend/src/app/features/content/shared/preview-button.component.html # frontend/src/app/features/dashboard/pages/dashboard-config.component.html # frontend/src/app/features/rules/pages/rule/rule-page.component.html # frontend/src/app/features/rules/pages/rules/rule.component.html # frontend/src/app/features/rules/pages/rules/rules-page.component.html # frontend/src/app/features/rules/shared/state-step.component.html # frontend/src/app/features/schemas/pages/schema/fields/field-wizard.component.html # frontend/src/app/features/schemas/pages/schema/fields/field.component.html # frontend/src/app/features/schemas/pages/schema/fields/forms/field-form.component.html # frontend/src/app/features/schemas/pages/schema/schema-page.component.html # frontend/src/app/features/schemas/pages/schema/scripts/schema-scripts-form.component.html # frontend/src/app/features/schemas/pages/schema/ui/schema-ui-form.component.html # frontend/src/app/features/schemas/pages/schemas/schema-form.component.html # frontend/src/app/features/settings/pages/asset-scripts/asset-scripts-page.component.html # frontend/src/app/features/settings/pages/clients/client-connect-form.component.html # frontend/src/app/features/settings/pages/workflows/workflow.component.html # frontend/src/app/features/teams/pages/contributors/contributor-add-form.component.html # frontend/src/app/framework/angular/layout.component.html # frontend/src/app/framework/angular/modals/modal-dialog.component.html # frontend/src/app/shared/components/assets/asset-dialog.component.html # frontend/src/app/shared/components/assets/asset-folder.component.html # frontend/src/app/shared/components/assets/asset-path.component.html # frontend/src/app/shared/components/assets/asset.component.html # frontend/src/app/shared/components/cards/api-calls-card.component.html # frontend/src/app/shared/components/search/query-list.component.html # frontend/src/app/shared/components/table-header.component.html # frontend/src/app/shell/pages/internal/profile-menu.component.htmlpull/1293/head
4 changed files with 41 additions and 13 deletions
Binary file not shown.
Loading…
Reference in new issue