Merge remote-tracking branch 'tulir/master' into element-master

Author: Half-Shot

Dockerfile

@@ -1,3 +1,4 @@
+# Upstream uses 3.15, but that breaks our build.
 FROM dock.mau.dev/tulir/lottieconverter:alpine-3.14
 
 ARG TARGETARCH=amd64

ROADMAP.md

@@ -59,5 +59,5 @@
   * [ ] ‡ Secret chats (i.e. End-to-bridge encryption on Telegram)
   * [x] End-to-bridge encryption in Matrix rooms (see [wiki](https://github.com/tulir/mautrix-telegram/wiki/End%E2%80%90to%E2%80%90bridge-encryption))
 
-† Information not automatically sent from source, i.e. implementation may not be possible
+† Information not automatically sent from source, i.e. implementation may not be possible  
 ‡ Maybe, i.e. this feature may or may not be implemented at some point