Skip to content

Conversation

@SebastianStehle
Copy link
Contributor

No description provided.

# Conflicts:
#	frontend/src/app/features/administration/pages/users/user-page.component.ts
#	frontend/src/app/features/administration/services/users.service.spec.ts
#	frontend/src/app/features/administration/services/users.service.ts
#	frontend/src/app/features/administration/state/users.forms.ts
#	frontend/src/app/features/administration/state/users.state.spec.ts
#	frontend/src/app/features/administration/state/users.state.ts
#	frontend/src/app/features/content/shared/forms/content-section.component.ts
#	frontend/src/app/features/rules/pages/rule/rule-page.component.ts
#	frontend/src/app/features/schemas/pages/schema/fields/field-wizard.component.ts
#	frontend/src/app/features/schemas/pages/schema/fields/field.component.ts
#	frontend/src/app/features/schemas/pages/schema/indexes/index-form.component.ts
#	frontend/src/app/features/settings/pages/workflows/workflow-step.component.html
#	frontend/src/app/features/settings/pages/workflows/workflow-step.component.ts
#	frontend/src/app/features/settings/pages/workflows/workflow.component.html
#	frontend/src/app/features/settings/pages/workflows/workflow.component.ts
#	frontend/src/app/features/teams/services/team-contributors.service.spec.ts
#	frontend/src/app/features/teams/services/team-contributors.service.ts
#	frontend/src/app/features/teams/services/team-plans.service.spec.ts
#	frontend/src/app/features/teams/services/team-plans.service.ts
#	frontend/src/app/features/teams/state/team-auth.state.spec.ts
#	frontend/src/app/features/teams/state/team-auth.state.ts
#	frontend/src/app/features/teams/state/team-contributors.forms.ts
#	frontend/src/app/features/teams/state/team-contributors.state.spec.ts
#	frontend/src/app/features/teams/state/team-contributors.state.ts
#	frontend/src/app/features/teams/state/team-plans.state.ts
#	frontend/src/app/shared/components/assets/asset-dialog.component.ts
#	frontend/src/app/shared/components/assets/image-focus-point.component.ts
#	frontend/src/app/shared/model/custom.ts
#	frontend/src/app/shared/model/generated.ts
#	frontend/src/app/shared/services/app-languages.service.spec.ts
#	frontend/src/app/shared/services/app-languages.service.ts
#	frontend/src/app/shared/services/apps.service.spec.ts
#	frontend/src/app/shared/services/apps.service.ts
#	frontend/src/app/shared/services/assets.service.spec.ts
#	frontend/src/app/shared/services/assets.service.ts
#	frontend/src/app/shared/services/clients.service.spec.ts
#	frontend/src/app/shared/services/clients.service.ts
#	frontend/src/app/shared/services/contents.service.spec.ts
#	frontend/src/app/shared/services/contents.service.ts
#	frontend/src/app/shared/services/contributors.service.spec.ts
#	frontend/src/app/shared/services/contributors.service.ts
#	frontend/src/app/shared/services/indexes.service.spec.ts
#	frontend/src/app/shared/services/indexes.service.ts
#	frontend/src/app/shared/services/jobs.service.spec.ts
#	frontend/src/app/shared/services/jobs.service.ts
#	frontend/src/app/shared/services/plans.service.spec.ts
#	frontend/src/app/shared/services/plans.service.ts
#	frontend/src/app/shared/services/roles.service.spec.ts
#	frontend/src/app/shared/services/roles.service.ts
#	frontend/src/app/shared/services/rules.service.spec.ts
#	frontend/src/app/shared/services/rules.service.ts
#	frontend/src/app/shared/services/schemas.service.spec.ts
#	frontend/src/app/shared/services/schemas.service.ts
#	frontend/src/app/shared/services/teams.service.spec.ts
#	frontend/src/app/shared/services/teams.service.ts
#	frontend/src/app/shared/services/translations.service.ts
#	frontend/src/app/shared/services/workflows.service.spec.ts
#	frontend/src/app/shared/services/workflows.service.ts
#	frontend/src/app/shared/state/_test-helpers.ts
#	frontend/src/app/shared/state/apps.forms.ts
#	frontend/src/app/shared/state/apps.state.ts
#	frontend/src/app/shared/state/asset-scripts.state.spec.ts
#	frontend/src/app/shared/state/asset-scripts.state.ts
#	frontend/src/app/shared/state/assets.forms.ts
#	frontend/src/app/shared/state/assets.state.spec.ts
#	frontend/src/app/shared/state/assets.state.ts
#	frontend/src/app/shared/state/backups.forms.ts
#	frontend/src/app/shared/state/clients.forms.ts
#	frontend/src/app/shared/state/clients.state.spec.ts
#	frontend/src/app/shared/state/clients.state.ts
#	frontend/src/app/shared/state/contents.forms.spec.ts
#	frontend/src/app/shared/state/contents.state.ts
#	frontend/src/app/shared/state/contributors.forms.ts
#	frontend/src/app/shared/state/contributors.state.spec.ts
#	frontend/src/app/shared/state/contributors.state.ts
#	frontend/src/app/shared/state/indexes.forms.ts
#	frontend/src/app/shared/state/indexes.state.spec.ts
#	frontend/src/app/shared/state/indexes.state.ts
#	frontend/src/app/shared/state/languages.forms.ts
#	frontend/src/app/shared/state/languages.state.spec.ts
#	frontend/src/app/shared/state/languages.state.ts
#	frontend/src/app/shared/state/plans.state.ts
#	frontend/src/app/shared/state/roles.forms.ts
#	frontend/src/app/shared/state/roles.state.spec.ts
#	frontend/src/app/shared/state/roles.state.ts
#	frontend/src/app/shared/state/rule-events.state.ts
#	frontend/src/app/shared/state/rules.forms.ts
#	frontend/src/app/shared/state/rules.state.spec.ts
#	frontend/src/app/shared/state/rules.state.ts
#	frontend/src/app/shared/state/schemas.forms.ts
#	frontend/src/app/shared/state/schemas.state.spec.ts
#	frontend/src/app/shared/state/schemas.state.ts
#	frontend/src/app/shared/state/teams.forms.ts
#	frontend/src/app/shared/state/teams.state.spec.ts
#	frontend/src/app/shared/state/workflows.forms.ts
#	frontend/src/app/shared/state/workflows.state.spec.ts
#	frontend/src/app/shared/state/workflows.state.ts
#	frontend/src/spec/matchers.ts
#	frontend/tsconfig.spec.json
@SebastianStehle SebastianStehle merged commit 75a079b into master May 5, 2025
8 checks passed
@SebastianStehle SebastianStehle deleted the flows branch May 5, 2025 12:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants