Skip to content
Snippets Groups Projects
  • Kristof De Langhe's avatar
    Merge branch 'master' into w2p-68346_Bundles-in-edit-item-Updates · a054938d
    Kristof De Langhe authored
    Conflicts:
    	package.json
    	src/app/+item-page/item-page-routing.module.ts
    	src/app/core/cache/builders/remote-data-build.service.ts
    	src/app/core/cache/server-sync-buffer.effects.ts
    	src/app/core/core.module.ts
    	src/app/core/data/bitstream-data.service.ts
    	src/app/core/data/bundle-data.service.ts
    	src/app/core/data/data.service.ts
    	src/app/core/data/dso-change-analyzer.service.ts
    	src/app/core/data/item-data.service.ts
    	src/app/core/data/object-updates/object-updates.actions.ts
    	src/app/core/shared/bitstream.model.ts
    	src/app/core/shared/dspace-object.model.ts
    	src/app/shared/mocks/mock-request.service.ts
    	src/app/shared/shared.module.ts
    	yarn.lock
    a054938d