a2e17e Merge branch 'hellcp/matrix-appservice-discord' into 'production'

Merged and Committed by Christian Boltz 4 years ago
    Merge branch 'hellcp/matrix-appservice-discord' into 'production'
    
    Store appservice-discord data in the pillar
    
    See merge request infra/salt!337
        
file modified
+3 -0