Merge branch 'master' into intigrate-collect-assets
This commit is contained in:
commit
282e098086
67 files changed
+677
-708
No files matched your search
@@ -390,6 +390,7 @@ impl From<DebianSettings> for tauri_bundler::DebianSettings {
|
||||
tauri_bundler::DebianSettings {
|
||||
depends: val.depends,
|
||||
files: val.files,
|
||||
desktop_template: None,
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -531,6 +532,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