hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-17 23:13:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
47294d37bf745006952b04f9dee6d8851a9336cf
dspace-angular/resources
History
Kristof De Langhe 47294d37bf Merge branch 'master' into Item-Collection_Mapper 
Conflicts:
	resources/i18n/en.json
	src/app/+item-page/edit-item-page/edit-item-page.component.ts
	src/app/+item-page/edit-item-page/edit-item-page.module.ts
	src/app/+item-page/edit-item-page/edit-item-page.routing.module.ts
	src/app/+item-page/edit-item-page/item-status/item-status.component.html
	src/app/+item-page/edit-item-page/item-status/item-status.component.spec.ts
	src/app/+item-page/edit-item-page/item-status/item-status.component.ts
	src/app/+item-page/item-page-routing.module.ts
	src/app/core/data/item-data.service.spec.ts
	src/app/core/data/item-data.service.ts
	src/app/core/shared/operators.spec.ts
	src/app/core/shared/operators.ts
2019-01-17 15:57:25 +01:00
..
i18n
Merge branch 'master' into Item-Collection_Mapper
2019-01-17 15:57:25 +01:00
images
Merged with dspace logo svg
2018-12-20 09:14:02 -08:00