Timo Kösters b9de21949d Update to rocket master (#147) ...

Merge branch 'master' into rocket

Update to rocket master

Co-authored-by: timokoesters <timo@koesters.xyz>
Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/147

2020-07-14 18:23:26 +02:00

..

database

feat: account deactivation (#137)

2020-07-05 07:48:19 +02:00

client_server.rs

feat: implement /event (#144)

2020-07-11 14:08:37 +02:00

database.rs

feat: cross-signing

2020-06-26 15:16:15 +02:00

error.rs

Update to rocket master (#147)

2020-07-14 18:23:26 +02:00

main.rs

feat: implement /event (#144)

2020-07-11 14:08:37 +02:00

pdu.rs

improvement: better default push rules

2020-06-16 23:25:14 +02:00

push_rules.rs

feat: cross-signing

2020-06-26 15:16:15 +02:00

ruma_wrapper.rs

Update to rocket master (#147)

2020-07-14 18:23:26 +02:00

server_server.rs

Switch to the ruma meta-crate

2020-06-05 18:42:45 +02:00

stateres.rs

work

2020-04-29 10:27:31 +02:00

utils.rs

refactor: better error handling

2020-06-11 13:14:35 +02:00