Merge branch 'master' into cli-serde-default
This commit is contained in:
commit
070ef6aec9
465 files changed
+5887
-14677
No files matched your search
@@ -422,6 +422,7 @@ impl From<DebianSettings> for tauri_bundler::DebianSettings {
|
||||
tauri_bundler::DebianSettings {
|
||||
depends: val.depends,
|
||||
files: val.files,
|
||||
desktop_template: None,
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -563,6 +564,8 @@ impl From<NsisSettings> for tauri_bundler::NsisSettings {
|
||||
install_mode: val.install_mode.into(),
|
||||
languages: val.languages,
|
||||
display_language_selector: val.display_language_selector,
|
||||
custom_language_files: None,
|
||||
template: None,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user