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

Merge remote-tracking branch 'remotes/origin/master' into #601-resource-policies

Browse Source 
# Conflicts:
#	src/app/core/eperson/eperson-data.service.spec.ts
#	src/app/core/eperson/group-data.service.spec.ts
#	src/app/shared/shared.module.ts
#	src/app/submission/sections/upload/section-upload.component.spec.ts
This commit is contained in:
Giuseppe Digilio
2020-05-20 15:37:33 +02:00
parent bacb778fa7 b28f59f087
commit b5d92590ee
585 changed files with 7233 additions and 9615 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/shared/testing/group-mock.ts
View File

@@ -1,5 +1,5 @@
import { Group } from '../../core/eperson/models/group.model';
import { EPersonMock } from './eperson-mock';
import { EPersonMock } from './eperson.mock';
export const GroupMock2: Group = Object.assign(new Group(), {
handle: null,