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

Merge branch 'w2p-67478_Search-external-sources-in-submission' into...

Merge branch 'w2p-67478_Search-external-sources-in-submission' into w2p-67611_Convert-external-source-to-entity

Conflicts:
	src/app/core/data/item-data.service.ts
parents f0e38e9e cdbb9b62
No related branches found
No related tags found
No related merge requests found
Showing
with 124 additions and 29 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