Kristof De Langhe
|
b51218ad5f
|
Merge branch 'master' into w2p-67478_Search-external-sources-in-submission
Conflicts:
src/app/+collection-page/collection-page.module.ts
src/app/+item-page/simple/related-entities/related-entities-search/related-entities-search.component.html
src/app/+item-page/simple/related-items/related-items-component.ts
src/app/+search-page/configuration-search-page.component.spec.ts
src/app/+search-page/configuration-search-page.component.ts
src/app/+search-page/filtered-search-page.component.spec.ts
src/app/+search-page/filtered-search-page.component.ts
src/app/+search-page/search-page.component.html
src/app/+search-page/search-page.component.ts
src/app/+search-page/search-page.module.ts
src/app/+search-page/search.component.spec.ts
src/app/app.reducer.ts
src/app/core/data/data.service.spec.ts
src/app/core/data/data.service.ts
src/app/core/data/relationship.service.ts
src/app/core/shared/search/search-configuration.service.ts
src/app/core/shared/search/search.service.ts
|
2019-12-06 11:56:28 +01:00 |
|