c73a22 Merge branch 'hellcp/matrix-switch-to-pgsql' into 'production'

Merged and Committed by Christian Boltz 3 years ago
25 files changed. 2945 lines added. 216 lines removed.
    Merge branch 'hellcp/matrix-switch-to-pgsql' into 'production'
    
    Setup more integrations for matrix and riot
    
    See merge request infra/salt!349
        
file modified
+66 -6
file modified
+1384 -88
file modified
+36 -13
salt/profile/matrix/files/appservice.service salt/profile/matrix/files/discord.service
file renamed
+3 -3
empty file added
file modified
+0 -17
file modified
+3 -1