Commit 93ac195
committed
Merge branch 'fix-enabling-video-mediaviewer-without-image-mediaviewer-7.2' into fix-enabling-video-mediaviewer-without-image-mediaviewer-main
# Conflicts:
# src/app/item-page/media-viewer/media-viewer.component.html1 file changed
Lines changed: 4 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
16 | 16 | | |
17 | 17 | | |
18 | 18 | | |
19 | | - | |
| 19 | + | |
20 | 20 | | |
21 | 21 | | |
22 | 22 | | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
23 | 26 | | |
24 | 27 | | |
0 commit comments