Merge branch 'master' into synapse-workers

This commit is contained in:
Slavi Pantaleev 2021-01-27 17:12:16 +02:00
commit 39c2d72d17

View file

@ -118,7 +118,7 @@ matrix_mautrix_telegram_registration_yaml: |
regex: '^#telegram_.+:{{ matrix_mautrix_telegram_homeserver_domain|regex_escape }}$'
# See https://github.com/tulir/mautrix-signal/issues/43
sender_localpart: _bot_{{ matrix_mautrix_telegram_appservice_bot_username }}
sender_localpart: telegrambot
url: {{ matrix_mautrix_telegram_appservice_address }}
rate_limited: false
matrix_mautrix_telegram_registration: "{{ matrix_mautrix_telegram_registration_yaml|from_yaml }}"