diff options
| author | Mark Monteiro <marknr.monteiro@protonmail.com> | 2020-04-26 17:37:30 -0400 |
|---|---|---|
| committer | Mark Monteiro <marknr.monteiro@protonmail.com> | 2020-04-26 17:37:30 -0400 |
| commit | 679f97d5e97d273076d886e99fe997bf8c2cb1b1 (patch) | |
| tree | 422758622b06f437e64b783c9a7c5e8993072c0e /windows/helpers/StrSlash.nsh | |
| parent | cabdec87e8e946bfa5de0dd0f97129f1a23e7d98 (diff) | |
| parent | 241dea6706dc79deb80e7416a1b0a1b58e93f403 (diff) | |
Merge remote-tracking branch 'upstream/master' into simplify-https-config
Also reverts conflicting changes made in https://github.com/jellyfin/jellyfin/pull/2798
Diffstat (limited to 'windows/helpers/StrSlash.nsh')
0 files changed, 0 insertions, 0 deletions