Merge branch 'master' of git.binary-kitchen.de:moepman/infra

This commit is contained in:
Kishi 2018-07-30 21:32:37 +02:00
commit bdba30f4b7

View File

@ -35,12 +35,13 @@ mail_trusted: 213.166.246.0/28 213.166.246.250/32 [2a02:958:0:f6::]/124
mail_aliases:
- "info@binary-kitchen.de vorstand@binary-kitchen.de"
- "lebercast@binary-kitchen.de anti@binary-kitchen.de,dragonchaser@binary-kitchen.de,moepman@binary-kitchen.de,philmacfly@binary-kitchen.de,ralf@binary-kitchen.de"
- "loetworkshop@binary-kitchen.de timo.schindler@binary-kitchen.de"
- "loetworkshop@binary-kitchen.de marei@binary-kitchen.de,timo.schindler@binary-kitchen.de"
- "mayday@binary-kitchen.de anti@binary-kitchen.de"
- "seife@binary-kitchen.de anke@binary-kitchen.de"
- "siebdruck@binary-kitchen.de anke@binary-kitchen.de"
- "sysadmin.mail@binary-kitchen.de moepman@binary-kitchen.de"
- "vorstand@binary-kitchen.de anti@binary-kitchen.de,avarrish@binary-kitchen.de,moepman@binary-kitchen.de,philmacfly@binary-kitchen.de"
- "workshops@binary-kitchen.de marei@binary-kitchen.de,timo.schindler@binary-kitchen.de"
- "openhab@binary-kitchen.de noby@binary-kitchen.de"
- "orga@ccc-r.de orga@ccc-regensburg.de"
- "orga@ccc-regensburg.de anti@binary-kitchen.de"