Merge branch 'master' into master

2019-08-21 07:34:20 +03:00
parent 63cf891842 63d1ed1d56
commit 65da600426
42 changed files with 1075 additions and 34 deletions
--- a/setup.yml
+++ b/setup.yml
@ -12,12 +12,14 @@
    - matrix-bridge-appservice-slack
    - matrix-bridge-appservice-irc
    - matrix-bridge-mautrix-facebook
+    - matrix-bridge-mautrix-hangouts
    - matrix-bridge-mautrix-telegram
    - matrix-bridge-mautrix-whatsapp
    - matrix-synapse
    - matrix-riot-web
    - matrix-mxisd
    - matrix-dimension
+    - matrix-email2matrix
    - matrix-nginx-proxy
    - matrix-coturn
    - matrix-common-after