Commits

Kristof De Langhe authored 42d12a83ce1 Merge 
Merge branch 'master' into w2p-65240_Community-and-collection-logos

Conflicts:
	src/app/shared/shared.module.ts
9df5a508f15

Everything looks good. We'll let you know here if there's anything you should know about.

Add shortcut