diff options
| author | Mark Monteiro <marknr.monteiro@protonmail.com> | 2020-03-11 23:04:47 +0100 |
|---|---|---|
| committer | Mark Monteiro <marknr.monteiro@protonmail.com> | 2020-03-11 23:04:47 +0100 |
| commit | 99bf6edba27c48db6094d1364a7175a0af9158b5 (patch) | |
| tree | 87ea497716c6e92ae9b7e3cfc540256350b05430 /deployment | |
| parent | d437950ac30ee294ab275362abe711ae3c14ac32 (diff) | |
| parent | 008a76cf4d7f04eee2f0e1b8d135ea835d7ec7e2 (diff) | |
Merge remote-tracking branch 'upstream/master' into support-running-without-web-content
Diffstat (limited to 'deployment')
| -rw-r--r-- | deployment/fedora-package-x64/Dockerfile | 2 | ||||
| -rw-r--r-- | deployment/windows/jellyfin.nsi | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/deployment/fedora-package-x64/Dockerfile b/deployment/fedora-package-x64/Dockerfile index 05a4ef21f9..87120f3a05 100644 --- a/deployment/fedora-package-x64/Dockerfile +++ b/deployment/fedora-package-x64/Dockerfile @@ -1,4 +1,4 @@ -FROM fedora:29 +FROM fedora:31 # Docker build arguments ARG SOURCE_DIR=/jellyfin ARG PLATFORM_DIR=/jellyfin/deployment/fedora-package-x64 diff --git a/deployment/windows/jellyfin.nsi b/deployment/windows/jellyfin.nsi index 86724b8f49..fada62d981 100644 --- a/deployment/windows/jellyfin.nsi +++ b/deployment/windows/jellyfin.nsi @@ -73,7 +73,7 @@ Unicode True ; TODO: Replace with nice Jellyfin Icons !ifdef UXPATH !define MUI_ICON "${UXPATH}\branding\NSIS\modern-install.ico" ; Installer Icon - !define MUI_UNICON "${UXPATH}\branding\NSIS\modern-uninstall.ico" ; Uninstaller Icon + !define MUI_UNICON "${UXPATH}\branding\NSIS\modern-install.ico" ; Uninstaller Icon !define MUI_HEADERIMAGE !define MUI_HEADERIMAGE_BITMAP "${UXPATH}\branding\NSIS\installer-header.bmp" |