mirror of
https://github.com/DSpace/dspace-angular.git
synced 2025-10-15 05:53:03 +00:00
190f245635
# Conflicts: # src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.spec.ts # src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.spec.ts # src/app/shared/mydspace-actions/claimed-task/switcher/claimed-task-actions-loader.component.ts # src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.ts # src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.html # src/app/shared/object-grid/community-grid-element/community-grid-element.component.html # src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.html # src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.html # src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.html # src/app/shared/theme-support/themed.component.ts # src/app/thumbnail/thumbnail.component.spec.ts # src/app/thumbnail/thumbnail.component.ts # src/themes/custom/lazy-theme.module.ts