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

Merge branch 'master' into w2p-64503_Edit-collection-Content-Source-2 

Conflicts:
	resources/i18n/en.json5
	src/app/core/core.module.ts
	src/app/core/data/collection-data.service.ts
	src/app/shared/shared.module.ts
parents 8c3416ce 4b67dbf1
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 933 additions and 1605 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment