Kristof De Langhe 9766a65c3a Merge branch 'master' into w2p-61493_Configurable-entities-master-merge ...

Conflicts:
	src/app/+item-page/item-page.module.ts
	src/app/+search-page/search-filters/search-filter/search-filter.service.ts
	src/app/+search-page/search-page.component.ts
	src/app/+search-page/search-page.module.ts
	src/app/core/shared/dspace-object.model.ts
	src/app/core/shared/item.model.ts
	src/app/core/shared/metadata.models.ts
	src/app/core/shared/resource-type.ts
	src/app/shared/services/route.service.spec.ts
	src/app/shared/services/route.service.ts
	src/app/thumbnail/thumbnail.component.html

2019-04-01 15:52:53 +02:00

..

environment.default.js

Merge branch 'master' into w2p-61493_Configurable-entities-master-merge

2019-04-01 15:52:53 +02:00

environment.test.js

have prod, test, and dev environment config files override default

2017-07-19 11:07:26 -05:00