Merge remote-tracking branch 'origin/master' into w2p-44024_simple-search-with-select

Conflicts: package.json src/app/core/cache/builders/remote-data-build.service.ts src/app/shared/shared.module.ts
2025-10-10 19:43:04 +00:00 · 2017-09-20 16:07:34 +02:00
parent b0bfff15a6 6db85d1e7b
commit c38a43ff2b
43 changed files with 325 additions and 278 deletions
--- a/src/app/shared/pagination/pagination.component.spec.ts
+++ b/src/app/shared/pagination/pagination.component.spec.ts
@@ -140,7 +140,7 @@ describe('Pagination component', () => {
    TestBed.configureTestingModule({
      imports: [
        CommonModule,
-        StoreModule.provideStore({}),
+        StoreModule.forRoot({}),
        TranslateModule.forRoot({
          loader: {
            provide: TranslateLoader,