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

Merge remote-tracking branch 'upstream/master' into pagination

Browse Source 
# Conflicts:
#	package.json
#	src/app/app.component.html
#	src/app/app.component.ts
#	src/app/core/cache/request-cache.reducer.spec.ts
#	src/app/core/cache/request-cache.service.spec.ts
#	src/app/core/core.module.ts
#	src/app/shared/shared.module.ts
This commit is contained in:
Giuseppe Digilio
2017-05-19 22:03:21 +02:00
parent 412a3a3970 71c1e3a549
commit 92f1d95ddd
134 changed files with 2947 additions and 1585 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/shared/pagination/pagination.component.ts
View File

@@ -15,7 +15,7 @@ import { Store } from "@ngrx/store";
import { Observable } from "rxjs";
import { HostWindowState } from "../host-window.reducer";
import { PaginationOptions } from '../../core/shared/pagination-options.model';
import { PaginationOptions } from '../../core/cache/models/pagination-options.model';
/**
* The default pagination controls component.