Kristof De Langhe
|
31b3a1fdaa
|
Merge branch 'master' into w2p-58789_Metadata-Registry-UI-Part-2
Conflicts:
src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts
src/app/+community-page/community-page.component.html
src/app/app.reducer.ts
src/app/core/auth/server-auth.service.ts
src/app/core/core.module.ts
src/app/core/data/item-data.service.spec.ts
src/app/core/data/item-data.service.ts
src/app/core/index/index.effects.ts
src/app/core/index/index.reducer.spec.ts
src/app/core/index/index.reducer.ts
src/app/core/shared/operators.spec.ts
src/app/core/shared/operators.ts
src/app/header/header.component.spec.ts
|
2019-01-24 13:18:20 +01:00 |
|