Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

F

frontend-clients
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

c03a02cb

Commit c03a02cb authored 1 year ago by Jan Zickermann

Downloads
- Patches
- Plain Diff

OZG-4993 OZG-5145 Fix merging problems

parent bf689cc9

No related branches found

No related tags found

No related merge requests found

Changes 9

Show whitespace changes

Inline Side-by-side

Showing

alfa-client/apps/admin/src/app/app.module.ts 7 additions, 1 deletion

alfa-client/apps/admin/src/app/app.module.ts
alfa-client/libs/admin-settings/src/lib/admin-settings.module.ts 10 additions, 1 deletion

...ient/libs/admin-settings/src/lib/admin-settings.module.ts
alfa-client/libs/admin-settings/src/lib/navigation/navigation.component.html 1 addition, 0 deletions

...min-settings/src/lib/navigation/navigation.component.html
alfa-client/libs/admin-settings/src/lib/navigation/navigation.component.spec.ts 6 additions, 1 deletion

...-settings/src/lib/navigation/navigation.component.spec.ts
alfa-client/libs/admin-settings/src/lib/oeid/oeid-container/oeid-list/oeid-list.component.ts 1 addition, 1 deletion

.../lib/oeid/oeid-container/oeid-list/oeid-list.component.ts
alfa-client/libs/admin-settings/src/lib/oeid/oeid-navigation-item/oeid-navigation-item.component.html 0 additions, 0 deletions

.../oeid-navigation-item/oeid-navigation-item.component.html
alfa-client/libs/admin-settings/src/lib/oeid/oeid-navigation-item/oeid-navigation-item.component.spec.ts 0 additions, 0 deletions

...id-navigation-item/oeid-navigation-item.component.spec.ts
alfa-client/libs/admin-settings/src/lib/oeid/oeid-navigation-item/oeid-navigation-item.component.ts 1 addition, 1 deletion

...id/oeid-navigation-item/oeid-navigation-item.component.ts
alfa-client/libs/admin-settings/src/lib/postfach/postfach-container/postfach-form/postfach-form.component.spec.ts 1 addition, 1 deletion

...h-container/postfach-form/postfach-form.component.spec.ts

with 27 additions and 6 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment

Impressum - Datenschutz - Barrierefreiheit