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

Merge branch 'master' into selectable-themes

Browse Source 
Conflicts:
	src/app/core/core.effects.ts
This commit is contained in:
lotte
2019-06-06 15:35:18 +02:00
parent 20d15dab54 4a1a64b728
commit 1753d55d77
93 changed files with 831 additions and 334 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/core/core.effects.ts
View File

@@ -5,6 +5,7 @@ import { AuthEffects } from './auth/auth.effects';
import { JsonPatchOperationsEffects } from './json-patch/json-patch-operations.effects';
import { ServerSyncBufferEffects } from './cache/server-sync-buffer.effects';
import { ObjectUpdatesEffects } from './data/object-updates/object-updates.effects';
import { RouteEffects } from '../shared/services/route.effects';
export const coreEffects = [
RequestEffects,
@@ -14,4 +15,5 @@ export const coreEffects = [
JsonPatchOperationsEffects,
ServerSyncBufferEffects,
ObjectUpdatesEffects,
RouteEffects
];