Merge branch 'master' into new-state-store

matrix_sdk/Cargo.toml

@@ -21,6 +21,7 @@ messages = ["matrix-sdk-base/messages"]
 encryption = ["matrix-sdk-base/encryption", "dashmap"]
 sled_cryptostore = ["matrix-sdk-base/sled_cryptostore"]
 unstable-synapse-quirks = ["matrix-sdk-base/unstable-synapse-quirks"]
+markdown = ["matrix-sdk-base/markdown"]
 native-tls = ["reqwest/native-tls"]
 rustls-tls = ["reqwest/rustls-tls"]
 socks = ["reqwest/socks"]

matrix_sdk/src/lib.rs

@@ -43,6 +43,7 @@
 //! destroyed.
 //! * `unstable-synapse-quirks`: Enables support to deal with inconsistencies
 //! of Synapse in compliance with the Matrix API specification.
+//! * `markdown`: Support for sending markdown formatted messages.
 //! * `socks`: Enables SOCKS support in reqwest, the default HTTP client.
 
 #![deny(

matrix_sdk_base/Cargo.toml

@@ -20,6 +20,7 @@ messages = []
 encryption = ["matrix-sdk-crypto"]
 sled_cryptostore = ["matrix-sdk-crypto/sled_cryptostore"]
 unstable-synapse-quirks = ["matrix-sdk-common/unstable-synapse-quirks"]
+markdown = ["matrix-sdk-common/markdown"]
 
 docs = ["encryption", "sled_cryptostore", "messages"]
 

matrix_sdk_base/src/lib.rs

@@ -26,6 +26,7 @@
 //! destroyed.
 //! * `unstable-synapse-quirks`: Enables support to deal with inconsistencies
 //! of Synapse in compliance with the Matrix API specification.
+//! * `markdown`: Support for sending markdown formatted messages.
 #![deny(
     missing_debug_implementations,
     trivial_casts,

matrix_sdk_common/Cargo.toml

@@ -12,6 +12,7 @@ version = "0.2.0"
 
 [features]
 unstable-synapse-quirks = ["ruma/unstable-synapse-quirks"]
+markdown = ["ruma/markdown"]
 
 [dependencies]
 instant = { version = "0.1.9", features = ["wasm-bindgen", "now"] }
@@ -20,6 +21,8 @@ async-trait = "0.1.42"
 
 [dependencies.ruma]
 version = "0.0.2"
+git = "https://github.com/ruma/ruma"
+rev = "8c109d3c0a7ec66b352dc82677d30db7cb0723eb"
 features = ["client-api", "unstable-pre-spec"]
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]