Skip to content
Snippets Groups Projects
Commit c25340fc authored by Kristof De Langhe's avatar Kristof De Langhe
Browse files

erge branch 'w2p-55946_Item-mapping-on-item-level-old' into w2p-55946_Item-mapping-on-item-level

Conflicts:
	resources/i18n/en.json
	src/app/+item-page/edit-item-page/edit-item-page.component.ts
	src/app/+item-page/edit-item-page/edit-item-page.module.ts
	src/app/+item-page/edit-item-page/edit-item-page.routing.module.ts
	src/app/+item-page/edit-item-page/item-status/item-status.component.html
	src/app/+item-page/edit-item-page/item-status/item-status.component.ts
parents 7d9afeef 6bc4d061
No related branches found
No related tags found
No related merge requests found
Showing
with 733 additions and 7 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 to comment