Giuseppe Digilio f8b3cc516c Merge remote-tracking branch 'remotes/origin/master' into authentication ...

# Conflicts:
#	src/app/+search-page/search-filters/search-filter/search-filter.component.ts
#	src/app/+search-page/search-filters/search-filter/search-filter.service.ts
#	src/app/+search-page/search-service/search.service.spec.ts
#	src/app/+search-page/search-service/search.service.ts
#	src/app/app.component.spec.ts
#	src/app/app.component.ts
#	src/app/core/cache/response-cache.models.ts
#	src/app/core/core.effects.ts
#	src/app/core/core.module.ts
#	src/app/core/shared/hal-endpoint.service.ts
#	src/app/shared/services/route.service.ts
#	src/app/shared/view-mode-switch/view-mode-switch.component.spec.ts
#	src/modules/app/browser-app.module.ts
#	src/modules/app/server-app.module.ts

2018-05-08 10:57:15 +02:00

..

i18n

Merge remote-tracking branch 'remotes/origin/master' into authentication

2018-05-08 10:57:15 +02:00

images

updated dspace logo and favicon

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