Merge pull request #184 from matrix-org/andybalaam/back-to-main-rust-…

…sdk-branch

Go back to depending on matrix-rust-sdk main branch

Cargo.toml

@@ -63,9 +63,9 @@ console_error_panic_hook = "0.1.7"
 futures-util = "0.3.27"
 http = "1.1.0"
 js-sys = "0.3.49"
-matrix-sdk-common = { git = "https://github.com/matrix-org/matrix-rust-sdk", features = ["js"], branch="release-for-crypto-wasm-12" }
-matrix-sdk-indexeddb = { git = "https://github.com/matrix-org/matrix-rust-sdk", default-features = false, features = ["e2e-encryption"], branch="release-for-crypto-wasm-12" }
-matrix-sdk-qrcode = { git = "https://github.com/matrix-org/matrix-rust-sdk", optional = true, branch="release-for-crypto-wasm-12" }
+matrix-sdk-common = { git = "https://github.com/matrix-org/matrix-rust-sdk", features = ["js"] }
+matrix-sdk-indexeddb = { git = "https://github.com/matrix-org/matrix-rust-sdk", default-features = false, features = ["e2e-encryption"] }
+matrix-sdk-qrcode = { git = "https://github.com/matrix-org/matrix-rust-sdk", optional = true }
 serde = "1.0.91"
 serde_json = "1.0.91"
 serde-wasm-bindgen = "0.5.0"
@@ -84,7 +84,6 @@ vergen = { version = "8.0.0", features = ["build", "git", "gitcl"] }
 git = "https://github.com/matrix-org/matrix-rust-sdk"
 default_features = false
 features = ["js", "automatic-room-key-forwarding"]
-branch = "release-for-crypto-wasm-12"
 
 [lints.rust]
 # Workaround for https://github.com/rustwasm/wasm-bindgen/issues/4283, while we work up the courage to upgrade