Kristof De Langhe 4590264d5a Merge branch 'master' into browse-by-features ...

Conflicts:
	src/app/core/core.module.ts
	src/app/core/shared/operators.ts
	src/app/shared/object-grid/item-grid-element/item-grid-element.component.html
	src/app/shared/object-list/item-list-element/item-list-element.component.html
	src/app/shared/shared.module.ts

2018-08-29 14:24:45 +02:00

..

i18n

Merge branch 'master' into browse-by-features

2018-08-29 14:24:45 +02:00

images

updated dspace logo and favicon

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