hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-19 16:03:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into w2p-60168_Alphabetic-browse-widget

Browse Source 
Conflicts:
	src/app/core/browse/browse.service.spec.ts
	src/app/core/browse/browse.service.ts
	src/app/core/data/dso-response-parsing.service.ts
	src/app/shared/shared.module.ts
This commit is contained in:
Kristof De Langhe
2019-02-21 13:35:21 +01:00
parent d53d193315 34e78bd495
commit fe5f436654
194 changed files with 4525 additions and 1762 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/core/data/browse-items-response-parsing-service.ts
View File

@@ -7,7 +7,7 @@ import {
ErrorResponse,
GenericSuccessResponse,
RestResponse
} from '../cache/response-cache.models';
} from '../cache/response.models';
import { DSpaceRESTV2Response } from '../dspace-rest-v2/dspace-rest-v2-response.model';
import { DSpaceRESTv2Serializer } from '../dspace-rest-v2/dspace-rest-v2.serializer';
import { BaseResponseParsingService } from './base-response-parsing.service';