Merge branch 'master' into w2p-68346_Bundles-in-edit-item-Updates

Conflicts:
	src/app/core/cache/server-sync-buffer.effects.ts
	src/app/core/data/data.service.spec.ts
	src/app/core/data/data.service.ts
	src/app/shared/shared.module.ts
This commit is contained in:
Kristof De Langhe
2020-03-19 17:12:04 +01:00
111 changed files with 4654 additions and 460 deletions

View File

@@ -32,6 +32,7 @@ const UPLOAD_BITSTREAM_PATH = 'bitstreams/new';
item: ItemPageResolver,
breadcrumb: ItemBreadcrumbResolver
},
runGuardsAndResolvers: 'always',
children: [
{
path: '',