Files
dspace-angular/resources
Kristof De Langhe 4f048f59f7 Merge branch 'master' into w2p-65272_Edit-collection-item-template
Conflicts:
	resources/i18n/en.json5
	src/app/+collection-page/collection-page.module.ts
	src/app/+collection-page/edit-collection-page/collection-metadata/collection-metadata.component.html
	src/app/+collection-page/edit-collection-page/collection-metadata/collection-metadata.component.spec.ts
	src/app/+collection-page/edit-collection-page/collection-metadata/collection-metadata.component.ts
	src/app/core/core.module.ts
	src/app/core/data/data.service.ts
	src/app/shared/shared.module.ts
2020-01-23 14:30:44 +01:00
..
2019-11-27 13:48:06 +01:00
2019-05-14 11:39:56 +02:00