Merge branch 'master' into e2be

This commit is contained in:
Tulir Asokan
2020-04-03 22:18:28 +03:00
+2
View File
@@ -62,6 +62,8 @@ appservice:
# Community ID for bridged users (changes registration file) and rooms.
# Must be created manually.
#
# Example: "+telegram:example.com". Set to false to disable.
community_id: false
# Authentication tokens for AS <-> HS communication. Autogenerated; do not modify.