resources/i18n/en.json5 · 0cd8a4ebcd2a6ac1f8c0c79932622e512edd8db2 · vtechworks / Dspace7 Angular

Something went wrong on our end

Merge branch 'w2p-63669_Edit-Col/Com-Tabs' into w2p-65240_Community-and-collection-logos · 0cd8a4eb

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

0cd8a4eb