Kristof De Langhe 079b8b7679 Merge remote-tracking branch 'dspace/master' into w2p-50632_Replace-mock-registry-service-with-implementation ...

Conflicts:
	src/app/app-routing.module.ts
	src/app/core/cache/response-cache.models.ts

2018-07-09 14:09:24 +02:00

..

i18n

Merge remote-tracking branch 'dspace/master' into w2p-50632_Replace-mock-registry-service-with-implementation

2018-07-09 14:09:24 +02:00

images

updated dspace logo and favicon

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