Commit 28d1c68
committed
Merge branch 'dspace-cris-2023_02_x' into task/ux-plus-2023_02_x/UXP-184_fixes
# Conflicts:
# src/app/shared/browse-most-elements/abstract-browse-elements.component.ts
# src/app/shared/browse-most-elements/default-browse-elements/default-browse-elements.component.html
# src/assets/i18n/ar.json5
# src/assets/i18n/bn.json5
# src/assets/i18n/ca.json5
# src/assets/i18n/cs.json5
# src/assets/i18n/el.json5
# src/assets/i18n/fr.json5
# src/assets/i18n/gd.json5
# src/assets/i18n/hi.json5
# src/assets/i18n/hu.json5
# src/assets/i18n/kk.json5
# src/assets/i18n/pl.json5
# src/assets/i18n/pt-BR.json5
# src/assets/i18n/pt-PT.json5
# src/assets/i18n/sr-cyr.json5
# src/assets/i18n/sr-lat.json5
# src/assets/i18n/sv.json5
# src/assets/i18n/vi.json529 files changed
Lines changed: 27998 additions & 24051 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
176 | 176 | | |
177 | 177 | | |
178 | 178 | | |
179 | | - | |
| 179 | + | |
180 | 180 | | |
181 | 181 | | |
182 | 182 | | |
| |||
src/app/shared/browse-most-elements/default-browse-elements/default-browse-elements.component.html
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | 3 | | |
4 | | - | |
| 4 | + | |
5 | 5 | | |
6 | 6 | | |
7 | 7 | | |
| |||
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
0 commit comments