Kristof De Langhe
|
ed3f7dfc7b
|
Merge branch 'master' into w2p-65572_Add-support-for-bundles
Conflicts:
src/app/core/shared/item.model.ts
src/app/entity-groups/journal-entities/item-grid-elements/journal-issue/journal-issue-grid-element.component.spec.ts
src/app/entity-groups/journal-entities/item-grid-elements/journal-volume/journal-volume-grid-element.component.spec.ts
src/app/entity-groups/journal-entities/item-grid-elements/journal/journal-grid-element.component.spec.ts
src/app/entity-groups/journal-entities/item-list-elements/journal-issue/journal-issue-list-element.component.spec.ts
src/app/entity-groups/journal-entities/item-list-elements/journal-volume/journal-volume-list-element.component.spec.ts
src/app/entity-groups/journal-entities/item-list-elements/journal/journal-list-element.component.spec.ts
src/app/entity-groups/research-entities/item-grid-elements/person/person-grid-element.component.spec.ts
src/app/entity-groups/research-entities/item-grid-elements/project/project-grid-element.component.spec.ts
src/app/entity-groups/research-entities/item-list-elements/orgunit/orgunit-list-element.component.spec.ts
src/app/entity-groups/research-entities/item-list-elements/person/person-list-element.component.spec.ts
src/app/entity-groups/research-entities/item-list-elements/project/project-list-element.component.spec.ts
src/app/shared/object-grid/item-grid-element/item-grid-element.component.spec.ts
src/app/shared/object-grid/item-grid-element/item-types/publication/publication-grid-element.component.spec.ts
src/app/shared/object-list/item-list-element/item-types/publication/publication-list-element.component.spec.ts
src/app/shared/testing/utils.ts
|
2019-11-21 14:14:39 +01:00 |
|