Merge branch 'master' into feature/use-shared-state-better-diagnostics

packages/desktop/Cargo.toml

@@ -4,7 +4,7 @@ version = "0.3.0"
 authors = ["Jonathan Kelley"]
 edition = "2018"
 description = "WebView renderer for Dioxus"
-license = "MIT/Apache-2.0"
+license = "MIT OR Apache-2.0"
 repository = "https://github.com/DioxusLabs/dioxus/"
 homepage = "https://dioxuslabs.com/docs/0.3/guide/en/getting_started/desktop.html"
 keywords = ["dom", "ui", "gui", "react"]