Michael-GMH 85777e8f96 merge with upstream

2021-05-25 21:08:00 +08:00

..

defaults

feat: push ephemeral events to appservices

2021-03-25 18:49:54 +01:00

tasks

Merge branch 'master' into hydrogen

2021-05-21 04:09:18 -05:00

templates

Make mautrix bridges not overwrite their config

2021-02-03 13:23:18 +02:00