Commit Graph

2 Commits

Author SHA1 Message Date
Kristof De Langhe
a0759098ea Merge branch 'w2p-72699_Hard-redirect-after-log-in' into w2p-72541_User-agreement-and-Privacy-statement
Conflicts:
	src/app/+collection-page/collection-page-routing.module.ts
	src/app/+community-page/community-page-routing.module.ts
	src/app/+item-page/item-page-routing.module.ts
	src/app/+workflowitems-edit-page/workflowitems-edit-page-routing.module.ts
	src/app/app-routing.module.ts
	src/app/core/shared/operators.ts
2020-09-03 16:06:59 +02:00
Art Lowel
21e8879f77 remove circular dependencies 2020-08-28 11:34:17 +02:00