Kristof De Langhe
|
0cd8a4ebcd
|
Merge branch 'w2p-63669_Edit-Col/Com-Tabs' into w2p-65240_Community-and-collection-logos
Conflicts:
resources/i18n/en.json5
src/app/+collection-page/edit-collection-page/edit-collection-page.component.html
src/app/+collection-page/edit-collection-page/edit-collection-page.component.spec.ts
src/app/+collection-page/edit-collection-page/edit-collection-page.component.ts
src/app/+community-page/edit-community-page/edit-community-page.component.html
src/app/+community-page/edit-community-page/edit-community-page.component.spec.ts
src/app/+community-page/edit-community-page/edit-community-page.component.ts
src/app/shared/comcol-forms/edit-comcol-page/edit-comcol-page.component.spec.ts
src/app/shared/comcol-forms/edit-comcol-page/edit-comcol-page.component.ts
|
2019-10-07 13:39:53 +02:00 |
|