Alexandre Vryghem
|
017e49aca0
|
Merge branch 'w2p-119915_made-edit-metadata-tab-fields-dynamic_contribute-7.6' into w2p-119915_made-edit-metadata-tab-fields-dynamic_contribute-main
# Conflicts:
# src/app/core/shared/context.model.ts
# src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.ts
# src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.html
# src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.ts
# src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts
# src/app/dso-shared/dso-shared.module.ts
# src/app/shared/testing/entity-type-data.service.stub.ts
|
2024-10-30 22:52:56 +01:00 |
|