Merge branch 'up-ruma' into 'develop'

Cargo.lock

Cargo.toml

src/client_server/account.rs

src/client_server/media.rs

src/client_server/push.rs

src/client_server/state.rs

src/database.rs

src/database/account_data.rs

src/database/key_backups.rs

src/database/pusher.rs

src/database/rooms.rs

src/database/rooms/edus.rs

src/database/sending.rs

src/database/uiaa.rs

src/database/users.rs

src/lib.rs

src/main.rs

src/push_rules.rs

src/ruma_wrapper.rs

src/server_server.rs