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

2017-05-19 23:07:42 +02:00
parent 92f1d95ddd
commit 04f1c1c08d
3 changed files with 5 additions and 4 deletions
--- a/src/app/shared/shared.module.ts
+++ b/src/app/shared/shared.module.ts
@@ -31,9 +31,9 @@ const PIPES = [
 ];

 const COMPONENTS = [
-  ThumbnailComponent
  // put shared components here
-  PaginationComponent
+  PaginationComponent,
+  ThumbnailComponent
 ];

 const PROVIDERS = [