Kristof De Langhe 2a4eebcfc4 Merge branch 'w2p-55693_Item-mapping-to-collections' into w2p-55946_Item-mapping-on-item-level ...

Conflicts:
	src/app/core/data/item-data.service.ts

2018-11-13 16:03:31 +01:00

..

i18n

Merge branch 'w2p-55693_Item-mapping-to-collections' into w2p-55946_Item-mapping-on-item-level

2018-11-13 16:03:31 +01:00

images

updated dspace logo and favicon

2017-07-13 08:07:01 -05:00